Project

General

Profile

« Previous | Next » 

Revision 71aeb5d9

Added by Cherian Mathew about 7 years ago

Fix merge commit

View differences:

eu.etaxonomy.taxeditor.application/.classpath
4 4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5 5
	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
6 6
	<classpathentry kind="src" path="src/test/java"/>
7
	<classpathentry kind="src" path="src/main/resources/"/>
7 8
	<classpathentry kind="output" path="target/classes"/>
8 9
</classpath>
eu.etaxonomy.taxeditor.bulkeditor/.classpath
1
<?xml version="1.0" encoding="UTF-8"?>
2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5
	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
6
	<classpathentry including="**/*.java" kind="src" path="src/test/java"/>
7
	<classpathentry kind="output" path="target/classes"/>
8
</classpath>
1
<?xml version="1.0" encoding="UTF-8"?>
2
<classpath>
3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5
	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
6
	<classpathentry including="**/*.java" kind="src" path="src/test/java"/>
7
	<classpathentry kind="output" path="target/classes"/>
8
</classpath>
eu.etaxonomy.taxeditor.cdmlib/.classpath
2 2
<classpath>
3 3
	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
4 4
	<classpathentry kind="con" path="org.eclipse.pde.core.requiredPlugins"/>
5
	<classpathentry including="**/*.java" kind="src" path="src/main/java"/>
6
	<classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
7
	<classpathentry kind="src" path="src/test/java"/>
5
	<classpathentry kind="src" path="src/main/java/"/>
6
	<classpathentry kind="src" path="src/main/resources/"/>
8 7
	<classpathentry exported="true" kind="lib" path="lib/activation-1.1.1.jar"/>
9 8
	<classpathentry exported="true" kind="lib" path="lib/antlr-2.7.7.jar"/>
10 9
	<classpathentry exported="true" kind="lib" path="lib/aopalliance-1.0.jar"/>
......
59 58
	<classpathentry exported="true" kind="lib" path="lib/hibernate-c3p0-4.1.10.Final.jar"/>
60 59
	<classpathentry exported="true" kind="lib" path="lib/hibernate-cglib-repack-2.1_3.jar"/>
61 60
	<classpathentry exported="true" kind="lib" path="lib/hibernate-commons-annotations-4.0.1.Final.jar"/>
62
	<classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.10.Final.jar" sourcepath="/home/cmathew/.m2/repository/org/hibernate/hibernate-core/4.1.10.Final/hibernate-core-4.1.10.Final-sources.jar"/>
61
	<classpathentry exported="true" kind="lib" path="lib/hibernate-core-4.1.10.Final.jar"/>
63 62
	<classpathentry exported="true" kind="lib" path="lib/hibernate-ehcache-4.1.10.Final.jar"/>
64 63
	<classpathentry exported="true" kind="lib" path="lib/hibernate-entitymanager-4.1.10.Final.jar"/>
65 64
	<classpathentry exported="true" kind="lib" path="lib/hibernate-envers-4.1.10.Final.jar"/>
......
198 197
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-remote-3.6.3-SNAPSHOT.jar"/>
199 198
	<classpathentry exported="true" kind="lib" path="lib/cdmlib-services-3.6.3-SNAPSHOT.jar"/>
200 199
	<classpathentry exported="true" kind="lib" path="lib/apache-log4j-extras-1.2.17.jar"/>
201
	<classpathentry kind="output" path="target/classes"/>
200
	<classpathentry kind="output" path="bin"/>
202 201
</classpath>
eu.etaxonomy.taxeditor.cdmlib/META-INF/MANIFEST.MF
2 2
Bundle-ManifestVersion: 2
3 3
Bundle-Name: CDM Library Dependencies Plugin
4 4
Bundle-SymbolicName: eu.etaxonomy.taxeditor.cdmlib;singleton:=true
5
Bundle-Version: 3.6.1.qualifier
5
Bundle-Version: 3.6.1
6 6
Eclipse-BundleShape: dir
7 7
Export-Package: com.google.api,
8 8
 com.google.api.detect,

Also available in: Unified diff