[Commits] (bcm) refactor spring config files to organize beans along functional lines - all

commits at osafoundation.org commits at osafoundation.org
Tue Apr 12 19:31:55 PDT 2005


Commit by: bcm
Modified files:
server/build.xml 1.34 1.35
server/core/build.xml 1.19 1.20
server/core/etc/applicationContext-jcr.xml None 1.1
server/core/etc/applicationContext-provisioning.xml None 1.1
server/core/etc/applicationContext-repository.xml None 1.1
server/core/etc/applicationContext-base.xml 1.5 1.6
server/core/etc/applicationContext-hibernate.xml 1.3 1.4
server/core/etc/applicationContext-jcr-client.xml 1.6 None
server/core/etc/applicationContext-manager.xml 1.2 None
server/core/test/etc/applicationContext-test.xml None 1.1
server/core/test/etc/applicationContext-test-base.xml 1.1 None
server/core/test/etc/applicationContext-test-datasource.xml 1.1 None
server/core/test/etc/applicationContext-test-jcr-client.xml 1.1 None
server/core/test/org/osaf/cosmo/BaseCoreTestCase.java 1.1 1.2
server/web/build.xml 1.5 1.6
server/web/etc/applicationContext-webapp.xml None 1.1
server/web/web/WEB-INF/web.xml 1.5 1.6

Log message:
refactor spring config files to organize beans along functional lines - all
provisioning beans (daos and manager) in one file, all hibernate beans in one
file, etc. the new organization allows us to provide a single test file that
overrides only the specific beans necessary the test environment.


ViewCVS links:
http://cvs.osafoundation.org/index.cgi/server/build.xml.diff?r1=text&tr1=1.34&r2=text&tr2=1.35
http://cvs.osafoundation.org/index.cgi/server/core/build.xml.diff?r1=text&tr1=1.19&r2=text&tr2=1.20
http://cvs.osafoundation.org/index.cgi/server/core/etc/applicationContext-jcr.xml?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/etc/applicationContext-provisioning.xml?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/etc/applicationContext-repository.xml?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/etc/applicationContext-base.xml.diff?r1=text&tr1=1.5&r2=text&tr2=1.6
http://cvs.osafoundation.org/index.cgi/server/core/etc/applicationContext-hibernate.xml.diff?r1=text&tr1=1.3&r2=text&tr2=1.4
http://cvs.osafoundation.org/index.cgi/server/core/etc/applicationContext-jcr-client.xml.diff?r1=text&tr1=1.6&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/etc/applicationContext-manager.xml.diff?r1=text&tr1=1.2&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/etc/applicationContext-test.xml?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/core/test/etc/applicationContext-test-base.xml.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/etc/applicationContext-test-datasource.xml.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/etc/applicationContext-test-jcr-client.xml.diff?r1=text&tr1=1.1&r2=text&tr2=None
http://cvs.osafoundation.org/index.cgi/server/core/test/org/osaf/cosmo/BaseCoreTestCase.java.diff?r1=text&tr1=1.1&r2=text&tr2=1.2
http://cvs.osafoundation.org/index.cgi/server/web/build.xml.diff?r1=text&tr1=1.5&r2=text&tr2=1.6
http://cvs.osafoundation.org/index.cgi/server/web/etc/applicationContext-webapp.xml?rev=1.1&content-type=text/vnd.viewcvs-markup
http://cvs.osafoundation.org/index.cgi/server/web/web/WEB-INF/web.xml.diff?r1=text&tr1=1.5&r2=text&tr2=1.6

Index: server/build.xml
diff -u server/build.xml:1.34 server/build.xml:1.35
--- server/build.xml:1.34	Tue Apr 12 18:51:51 2005
+++ server/build.xml	Tue Apr 12 19:31:50 2005
@@ -81,7 +81,7 @@
 
   <target name="test-clean-db"
           description="clean out the test database">
-    <delete dir="${cosmo.test}/db"/>
+    <delete dir="${cosmo.test}"/>
   </target>
 
   <target name="test-clean-core" description="clean core subsystem tests">
@@ -94,7 +94,8 @@
          inheritAll="false"/>
   </target>
 
-  <target name="test-clean" depends="test-clean-core,test-clean-web"
+  <target name="test-clean"
+          depends="test-clean-db,test-clean-core,test-clean-web"
           description="clean out test files">
     <delete dir="${cosmo.test}"/>
   </target>

Index: server/core/test/org/osaf/cosmo/BaseCoreTestCase.java
diff -u server/core/test/org/osaf/cosmo/BaseCoreTestCase.java:1.1 server/core/test/org/osaf/cosmo/BaseCoreTestCase.java:1.2
--- server/core/test/org/osaf/cosmo/BaseCoreTestCase.java:1.1	Tue Apr 12 18:52:44 2005
+++ server/core/test/org/osaf/cosmo/BaseCoreTestCase.java	Tue Apr 12 19:31:52 2005
@@ -22,11 +22,10 @@
     public BaseCoreTestCase(String name) {
         super(name);
         String[] paths = {
-            "/applicationContext-test-base.xml",
-            "/applicationContext-test-datasource.xml",
-            "/applicationContext-test-jcr-client.xml",
+            "/applicationContext-test.xml",
             "/applicationContext-hibernate.xml",
-            "/applicationContext-manager.xml"
+            "/applicationContext-jcr.xml",
+            "/applicationContext-provisioning.xml"
         };
         appCtx = new ClassPathXmlApplicationContext(paths);
     }

Index: server/web/build.xml
diff -u server/web/build.xml:1.5 server/web/build.xml:1.6
--- server/web/build.xml:1.5	Mon Apr 11 17:13:30 2005
+++ server/web/build.xml	Tue Apr 12 19:31:52 2005
@@ -46,8 +46,7 @@
   <target name="pack" description="pack the webapp">
     <copy todir="${web.build}/classes">
       <fileset dir="${web.etc}">
-        <include name="applicationContext-security-web.xml"/>
-        <include name="applicationContext-adapter-dav.xml"/>
+        <include name="applicationContext-*.xml"/>
         <include name="MessageResources.properties"/>
       </fileset>
     </copy>

Index: server/core/etc/applicationContext-hibernate.xml
diff -u server/core/etc/applicationContext-hibernate.xml:1.3 server/core/etc/applicationContext-hibernate.xml:1.4
--- server/core/etc/applicationContext-hibernate.xml:1.3	Tue Apr 12 16:59:18 2005
+++ server/core/etc/applicationContext-hibernate.xml	Tue Apr 12 19:31:51 2005
@@ -27,20 +27,4 @@
     </property>
   </bean>
 
-  <!-- Hibernate DAOs -->
-
-  <bean id="roleDAO"
-        class="org.osaf.cosmo.dao.hibernate.RoleDAOHibernate">
-    <property name="sessionFactory">
-      <ref local="sessionFactory"/>
-    </property>
-  </bean>
-
-  <bean id="userDAO"
-        class="org.osaf.cosmo.dao.hibernate.UserDAOHibernate">
-    <property name="sessionFactory">
-      <ref local="sessionFactory"/>
-    </property>
-  </bean>
-
 </beans>

Index: server/core/build.xml
diff -u server/core/build.xml:1.19 server/core/build.xml:1.20
--- server/core/build.xml:1.19	Tue Apr 12 18:52:41 2005
+++ server/core/build.xml	Tue Apr 12 19:31:51 2005
@@ -86,16 +86,14 @@
         <include name="hibernate.properties"/>
       </fileset>
       <fileset dir="${core.test}/etc">
-        <include name="applicationContext-test-base.xml"/>
-        <include name="applicationContext-test-jcr-client.xml"/>
-        <include name="applicationContext-test-datasource.xml"/>
+        <include name="applicationContext-test.xml"/>
         <include name="log4j.xml"/>
       </fileset>
       <filterset>
         <filter token="VERSION" value="${cosmo.version}"/>
         <filter token="SERVER_ADMIN" value="${cosmo.serverAdmin}"/>
         <filter token="CONFIGFILEPATH" value="${core.test}/etc/repository.xml"/>
-        <filter token="REPOSITORYHOMEDIRPATH" value="${core.test}/repository"/>
+        <filter token="REPOSITORYHOMEDIRPATH" value="${cosmo.test}/repository"/>
         <filter token="DIALECT" value="${cosmo.test.userdb.dialect}"/>
         <filter token="DRIVER" value="${cosmo.test.userdb.driver}"/>
         <filter token="DB_URL" value="${cosmo.test.userdb.url}"/>

Index: server/core/etc/applicationContext-base.xml
diff -u server/core/etc/applicationContext-base.xml:1.5 server/core/etc/applicationContext-base.xml:1.6
--- server/core/etc/applicationContext-base.xml:1.5	Tue Apr 12 18:52:42 2005
+++ server/core/etc/applicationContext-base.xml	Tue Apr 12 19:31:51 2005
@@ -5,7 +5,7 @@
 
 <beans>
 
-  <!-- Properties -->
+  <!-- Environment Entries -->
 
   <bean id="cosmoVersion"
         class="org.springframework.jndi.JndiObjectFactoryBean">
@@ -27,18 +27,4 @@
     </property>
   </bean>
 
-  <bean
-     class="org.springframework.web.context.support.ServletContextAttributeExporter">
-    <property name="attributes">
-      <map>
-        <entry key="cosmoVersion">
-          <ref local="cosmoVersion"/>
-        </entry>
-        <entry key="cosmoServerAdmin">
-          <ref local="cosmoServerAdmin"/>
-        </entry>
-      </map>
-    </property>
-  </bean>
-
 </beans>

Index: server/web/web/WEB-INF/web.xml
diff -u server/web/web/WEB-INF/web.xml:1.5 server/web/web/WEB-INF/web.xml:1.6
--- server/web/web/WEB-INF/web.xml:1.5	Tue Apr 12 16:59:19 2005
+++ server/web/web/WEB-INF/web.xml	Tue Apr 12 19:31:53 2005
@@ -9,10 +9,12 @@
     <param-value>
       classpath:applicationContext-base.xml
       classpath:applicationContext-datasource.xml
+      classpath:applicationContext-repository.xml
       classpath:applicationContext-hibernate.xml
-      classpath:applicationContext-jcr-client.xml
-      classpath:applicationContext-manager.xml
+      classpath:applicationContext-jcr.xml
+      classpath:applicationContext-provisioning.xml
       classpath:applicationContext-security.xml
+      classpath:applicationContext-webapp.xml
       classpath:applicationContext-security-web.xml
       classpath:applicationContext-adapter-dav.xml
     </param-value>



More information about the Commits mailing list