BGBM BDI Projects / taxeditor.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | compact (merge: c370688 1568c43)
merge-update from trunk
authorPatric Plitzner <p.plitzner@bgbm.org>
Tue, 1 Jul 2014 13:15:58 +0000 (13:15 +0000)
committerPatric Plitzner <p.plitzner@bgbm.org>
Tue, 1 Jul 2014 13:15:58 +0000 (13:15 +0000)
1  2 
.gitattributes patch | diff1 | diff2 | blob | history
eu.etaxonomy.taxeditor.cdmlib/.classpath patch | diff1 | diff2 | blob | history
eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar patch | diff1 | diff2 | blob | history
eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar patch | diff1 | diff2 | blob | history

diff --combined .gitattributes
index 9f96167dbc4a4f939902a3e6728af38b7ce4c36a,ba2b9885c191e221b6f815bae215f3d5a8c02365..9d1eca209faa75b484de5b0a32a07a1bdc91950b
--- 1/.gitattributes
--- 2/.gitattributes
+++ b/.gitattributes
@@@ -177,7 -177,7 +177,7 @@@ eu.etaxonomy.taxeditor.cdmlib/lib/doxia
  eu.etaxonomy.taxeditor.cdmlib/lib/dozer-5.3.0.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/easymock-3.1.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/easymockclassextension-2.3.jar -text
- eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.4.3.jar -text
+ eu.etaxonomy.taxeditor.cdmlib/lib/ehcache-core-2.6.9.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/ezmorph-1.0.6.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/fop-1.1.jar -text
  eu.etaxonomy.taxeditor.cdmlib/lib/google-api-translate-java-0.92.jar -text
@@@ -322,6 -322,7 +322,7 @@@ eu.etaxonomy.taxeditor.cdmlib/lib/yjp-c
  eu.etaxonomy.taxeditor.cdmlib/pom.xml -text
  eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteConfiguration.java -text
  eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/application/CdmApplicationRemoteController.java -text
+ eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/cache/CdmServiceCacher.java -text
  eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/api/lazyloading/CdmLazyLoader.java -text
  eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/CdmPersistentRemoteSource.java -text
  eu.etaxonomy.taxeditor.cdmlib/src/main/java/eu/etaxonomy/cdm/remote/CdmRemoteSource.java -text
@@@ -339,6 -340,7 +340,7 @@@ eu.etaxonomy.taxeditor.cdmlib/src/main/
  eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/remoting/CdmApplicationRemoteControllerTest.java -text
  eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/remoting/CdmPersistentRemoteSourceTest.java -text
  eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/remoting/CdmRemoteSourceTest.java -text
+ eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/remoting/CdmServiceCacherTest.java -text
  eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/remoting/HttpInvokerServicesTest.java -text
  eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/remoting/RemoteApplicationConfigurationTest.java -text
  eu.etaxonomy.taxeditor.cdmlib/src/test/java/eu/etaxonomy/taxeditor/remoting/RemoteLazyLoadingTest.java -text
@@@ -999,7 -1001,6 +1001,7 @@@ eu.etaxonomy.taxeditor.store/icons/bina
  eu.etaxonomy.taxeditor.store/icons/bookmark.gif -text
  eu.etaxonomy.taxeditor.store/icons/category.gif -text
  eu.etaxonomy.taxeditor.store/icons/change.gif -text
 +eu.etaxonomy.taxeditor.store/icons/character_data_derivate-16x16-32.png -text
  eu.etaxonomy.taxeditor.store/icons/clear.gif -text
  eu.etaxonomy.taxeditor.store/icons/close.gif -text
  eu.etaxonomy.taxeditor.store/icons/close_view.gif -text
@@@ -1381,7 -1382,6 +1383,7 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MinMaxTextSection.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/MultilanguageTextElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/NumberWithLabelElement.java -text
 +eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/OriginalLabelDataElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PartialElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/PointElement.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/element/RootElement.java -text
@@@ -1399,7 -1399,8 +1401,7 @@@ eu.etaxonomy.taxeditor.store/src/main/j
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/AbstractCdmComposite.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/DerivedUnitGeneralDetailElementMVC.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/GeographicPointElement.java -text
 -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataController.java -text
 -eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataElement.java -text
 +eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/OriginalLabelDataField.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermCombo.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/combo/EnumTermComboController.java -text
  eu.etaxonomy.taxeditor.store/src/main/java/eu/etaxonomy/taxeditor/ui/mvc/element/DateElement.java -text
diff --combined eu.etaxonomy.taxeditor.cdmlib/.classpath
index 343b48cbed904008e2753f85fc07158e41b360d6,fa4efb5065d057bbfdf7065dd334a7f7fd314373..ad6b2164196f143203a991a032968e4eba5d6723
--- 1/eu.etaxonomy.taxeditor.cdmlib/.classpath
--- 2/eu.etaxonomy.taxeditor.cdmlib/.classpath
+++ b/eu.etaxonomy.taxeditor.cdmlib/.classpath
@@@ -28,22 -28,22 +28,22 @@@
        <classpathentry exported="true" kind="lib" path="lib/batik-util-1.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/batik-xml-1.7.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/c3p0-0.9.2.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.3.6-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.3.6-SNAPSHOT.jar" sourcepath="lib/cdmlib-commons-3.3.6-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.3.6-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.3.6-SNAPSHOT.jar" sourcepath="lib/cdmlib-ext-3.3.6-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.3.6-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.3.6-SNAPSHOT.jar" sourcepath="lib/cdmlib-io-3.3.6-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.3.6-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.3.6-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.3.6-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.3.6-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.3.6-SNAPSHOT.jar" sourcepath="lib/cdmlib-persistence-3.3.6-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.3.6-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.3.6-SNAPSHOT.jar" sourcepath="lib/cdmlib-print-3.3.6-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.3.6-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.3.6-SNAPSHOT.jar" sourcepath="lib/cdmlib-remote-3.3.6-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.3.6-SNAPSHOT-sources.jar"/>
 -      <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.3.6-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.3.6-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-commons-3.4.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-commons-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-ext-3.4.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-ext-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-io-3.4.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-io-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-model-3.4.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-model-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-persistence-3.4.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-persistence-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-print-3.4.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-print-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.4.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-remote-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.4.0-SNAPSHOT-sources.jar"/>
 +      <classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.4.0-SNAPSHOT.jar" sourcepath="lib/cdmlib-services-3.4.0-SNAPSHOT-sources.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/cglib-nodep-2.2.2.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.aopalliance-1.0.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/com.springsource.org.apache.commons.logging-1.1.1.jar"/>
@@@ -66,7 -66,7 +66,7 @@@
        <classpathentry exported="true" kind="lib" path="lib/dozer-5.3.0.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/easymock-3.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/easymockclassextension-2.3.jar"/>
-       <classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.4.3.jar"/>
+       <classpathentry exported="true" kind="lib" path="lib/ehcache-core-2.6.9.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/ezmorph-1.0.6.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/fop-1.1.jar"/>
        <classpathentry exported="true" kind="lib" path="lib/guava-r05.jar"/>
diff --combined eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.equinox.common-3.6.0.v20110523.jar
index 9fb167cc8644ced846238dee40784f7341832719,9fb167cc8644ced846238dee40784f7341832719..4cf488ee33f1a17bac6e7badc2adfac6cf54f75d
Binary files differ
diff --combined eu.etaxonomy.taxeditor.cdmlib/lib/org.eclipse.osgi-3.7.2.v20120110-1415.jar
index 25f118068392d39fda76feea6c855dfb3633db17,25f118068392d39fda76feea6c855dfb3633db17..f131a431cbf20a8f2194c84912950bd3e0a6485b
Binary files differ