removing aspetcj capability and reverting to default

diff --git a/.gitattributes b/.gitattributes
index c296a7b01d4adf68d222e57531977bd910dd36c6..70efa9794554598e6f8cb0791eb65d75cec86324 100644 (file)
--- a/.gitattributes
+++ b/.gitattributes
@@ -1630,7 +1630,6 @@ eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/supplemen
 eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/view/supplementaldata/SupplementalDataViewer.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/org/eclipse/wb/swt/ResourceManager.java -text
 eu.etaxonomy.taxeditor.store/src/main/java/org/eclipse/wb/swt/SWTResourceManager.java -text
-eu.etaxonomy.taxeditor.store/src/main/resources/config.properties -text
 eu.etaxonomy.taxeditor.store/src/main/resources/eu/etaxonomy/cdm/editorApplicationContext.xml -text
 eu.etaxonomy.taxeditor.store/src/main/resources/log4j.properties -text
 eu.etaxonomy.taxeditor.store/src/test/java/eu/etaxonomy/taxeditor/store/NameProtectTitleCacheTest.java -text

diff --git a/eu.etaxonomy.taxeditor.cdmlib/.project b/eu.etaxonomy.taxeditor.cdmlib/.project
index 63767411ddaf24a18eacea11c8a1db29f1c2c621..2d7facc3c922276015e7219b03d9f68072cf8c62 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/.project
+++ b/eu.etaxonomy.taxeditor.cdmlib/.project
@@ -6,7 +6,7 @@
        </projects>
        <buildSpec>
                <buildCommand>
-                       <name>org.eclipse.ajdt.core.ajbuilder</name>
+                       <name>org.eclipse.jdt.core.javabuilder</name>
                        <arguments>
                        </arguments>
                </buildCommand>
@@ -22,7 +22,6 @@
                </buildCommand>
        </buildSpec>
        <natures>
-               <nature>org.eclipse.ajdt.ui.ajnature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
                <nature>org.eclipse.pde.PluginNature</nature>
        </natures>

diff --git a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
index 7b5109bdd9a2db1820f8f4a0d173efc52f14755a..9ed7957b84b75d2fd81c656533484d42acc0d587 100644 (file)
--- a/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
+++ b/eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
@@ -397,8 +397,7 @@ Export-Package: com.google.api,
 Bundle-Vendor: EDIT
 Bundle-RequiredExecutionEnvironment: JavaSE-1.6
 Require-Bundle: org.eclipse.osgi,
- org.eclipse.equinox.common,
- org.aspectj.runtime
+ org.eclipse.equinox.common
 Bundle-ClassPath: .,
  lib/activation-1.1.1.jar,
  lib/antlr-2.7.7.jar,

diff --git a/eu.etaxonomy.taxeditor.store/src/main/resources/config.properties b/eu.etaxonomy.taxeditor.store/src/main/resources/config.properties
deleted file mode 100644 (file)
index 85f6c1c..0000000
--- a/eu.etaxonomy.taxeditor.store/src/main/resources/config.properties
+++ /dev/null
@@ -1,2 +0,0 @@
-serverName=localhost:8080
-contextPath=

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 14bb1278b644118a6d9fa29c704717b440bcc467..01a1d00df79f25e211de00778263cae69efc7876 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
@@ -7,15 +7,15 @@
     http://www.springframework.org/schema/tx http://www.springframework.org/schema/tx/spring-tx-2.5.xsd
     http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd">\r
 \r
-  <import resource="classpath:/eu/etaxonomy/cdm/defaultApplicationContext.xml"/> \r
-  <!--import resource="classpath:/eu/etaxonomy/cdm/remotingApplicationContext.xml"/>-->\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>
   \r
-   <!-- <bean id="persistentTermInitializer" class="eu.etaxonomy.cdm.database.PersistentTermInitializer">\r
-    <property name="omit" value="false" />\r
-  </bean> -->\r
-   \r
-  <!-- <bean id="remoteTermInitializer" class="eu.etaxonomy.cdm.remote.service.RemoteTermInitializer">    \r
-  </bean> -->\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