updaed build properties to include source / resource files when packaging with maven

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 9ed7957b84b75d2fd81c656533484d42acc0d587..5f8e6447febb90c9ef67eab62f93e32c72658563 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -10,6 +10,7 @@ Export-Package: com.google.api,
  eu.etaxonomy.cdm.api.application,
  eu.etaxonomy.cdm.api.conversation,
  eu.etaxonomy.cdm.api.facade,
+ eu.etaxonomy.cdm.api.lazyloading,
  eu.etaxonomy.cdm.api.service,
  eu.etaxonomy.cdm.api.service.config,
  eu.etaxonomy.cdm.api.service.description,

diff --git a/eu.etaxonomy.taxeditor.cdmlib/build.properties b/eu.etaxonomy.taxeditor.cdmlib/build.properties
index f6b53c4d781d655664793141cdd81b3bd548ca35..c1f037903e75429c192a1c1e005eddc2afe75e9b 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/build.properties
+++ b/eu.etaxonomy.taxeditor.cdmlib/build.properties
@@ -1,4 +1,5 @@
 bin.includes = META-INF/,\\r
+               .,\\r
                lib/activation-1.1.1.jar,\\r
                lib/antlr-2.7.7.jar,\\r
                lib/aopalliance-1.0.jar,\\r
@@ -207,4 +208,5 @@ output.. = bin/
 source.. = src/main/java/,\\r
            src/main/resources/,\\r
            src/test/java/\r
+src.includes = src/\r
 \r

diff --git a/eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml b/eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml
index 2a879672fd11d97b76afc4ff25b2566dfedd147c..b402e67285da2986b850d3c49dd670ae7c225c13 100644 (file)
--- a/eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml
+++ b/eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml
@@ -3,33 +3,14 @@
   xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"\r
   xmlns:context="http://www.springframework.org/schema/context"\r
   xmlns:tx="http://www.springframework.org/schema/tx"\r
-  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
-    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
+  xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
+    http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd\r
     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">\r
 \r
-  <!-- Default application context and term initializer -->\r
-  <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/>
-  <bean id="persistentTermInitializer" class="eu.etaxonomy.cdm.database.PersistentTermInitializer">
-    <property name="omit" value="false" />
-  </bean>
+  <!-- Local application context and term initializer -->\r
+  <import resource="classpath:/eu/etaxonomy/cdm/localApplicationContext.xml"/>\r
   \r
   <!-- Remote application context and term initializer -->\r
-  <!-- <import resource="classpath:/eu/etaxonomy/cdm/remotingApplicationContext.xml"/> -->
-<!--  <bean id="remoteTermInitializer" class="eu.etaxonomy.cdm.remote.service.RemoteTermInitializer"/>-->
-  \r
-    \r
-  <import resource="classpath:/eu/etaxonomy/cdm/remote.xml"/>\r
-  <import resource="classpath:eu/etaxonomy/cdm/remote/json/jsonConfigurations.xml"/>\r
-  \r
-  <context:component-scan base-package="eu/etaxonomy/cdm/ext"/>\r
-  \r
-  <context:component-scan base-package="eu/etaxonomy/cdm/remote">\r
-    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.config\.DataSourceConfigurer" />\r
-    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.config\.LoggingConfigurer" />\r
-    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.view\.PatternViewResolver" />\r
-    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.vaadin\..*" />\r
-    <context:exclude-filter type="regex" expression="eu\.etaxonomy\.cdm\.remote\.controller\..*Portal.*" /> \r
-  </context:component-scan>\r
-  \r
+  <!--  <import resource="classpath:/eu/etaxonomy/cdm/remotingApplicationContext.xml"/> -->\r
   \r
 </beans>\r