From: <yo...@us...> - 2009-10-30 13:25:37
|
Revision: 222 http://treebase.svn.sourceforge.net/treebase/?rev=222&view=rev Author: youjun Date: 2009-10-30 13:25:23 +0000 (Fri, 30 Oct 2009) Log Message: ----------- Modified Paths: -------------- trunk/oai-pmh_data_provider/data_provider_core/.classpath trunk/oai-pmh_data_provider/data_provider_core/pom.xml trunk/oai-pmh_data_provider/data_provider_core/src/main/resources/hibernate.cfg.xml trunk/oai-pmh_data_provider/data_provider_web/.settings/org.eclipse.wst.common.component trunk/oai-pmh_data_provider/data_provider_web/.settings/org.maven.ide.eclipse.prefs trunk/oai-pmh_data_provider/data_provider_web/pom.xml trunk/oai-pmh_data_provider/pom.xml Modified: trunk/oai-pmh_data_provider/data_provider_core/.classpath =================================================================== --- trunk/oai-pmh_data_provider/data_provider_core/.classpath 2009-10-27 19:54:56 UTC (rev 221) +++ trunk/oai-pmh_data_provider/data_provider_core/.classpath 2009-10-30 13:25:23 UTC (rev 222) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <classpath> - <classpathentry kind="src" path="src/main/java"/> - <classpathentry kind="src" path="src/main/resources"/> - <classpathentry kind="src" path="src/test/java"/> - <classpathentry kind="src" path="src/test/resources"/> + <classpathentry kind="src" output="target/classes" path="src/main/java"/> + <classpathentry excluding="**" kind="src" output="target/classes" path="src/main/resources"/> + <classpathentry kind="src" output="target/test-classes" path="src/test/java"/> + <classpathentry excluding="**" kind="src" output="target/test-classes" path="src/test/resources"/> <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/> <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/> <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/> Modified: trunk/oai-pmh_data_provider/data_provider_core/pom.xml =================================================================== --- trunk/oai-pmh_data_provider/data_provider_core/pom.xml 2009-10-27 19:54:56 UTC (rev 221) +++ trunk/oai-pmh_data_provider/data_provider_core/pom.xml 2009-10-30 13:25:23 UTC (rev 222) @@ -1,9 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?><project> - <parent> + <!-- parent> <artifactId>oai-pmh_data_provider</artifactId> <groupId>org.treebase.oai</groupId> <version>0.0.1-SNAPSHOT</version> - </parent> + </parent--> <modelVersion>4.0.0</modelVersion> <groupId>org.treebase.oai</groupId> <artifactId>data_provider_core</artifactId> Modified: trunk/oai-pmh_data_provider/data_provider_core/src/main/resources/hibernate.cfg.xml =================================================================== --- trunk/oai-pmh_data_provider/data_provider_core/src/main/resources/hibernate.cfg.xml 2009-10-27 19:54:56 UTC (rev 221) +++ trunk/oai-pmh_data_provider/data_provider_core/src/main/resources/hibernate.cfg.xml 2009-10-30 13:25:23 UTC (rev 222) @@ -26,7 +26,7 @@ <property name="hibernate.connection.release_mode">auto</property> <property name="hibernate.query.substitutions">true 'T', false 'F'</property> - <!-- Mapping files --> + <!-- Mapping files use annotation --> <!-- mapping package="org.cipres.treebase.domain" /--> <mapping class="org.cipres.treebase.domain.AbstractPersistedObject" /> Modified: trunk/oai-pmh_data_provider/data_provider_web/.settings/org.eclipse.wst.common.component =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/.settings/org.eclipse.wst.common.component 2009-10-27 19:54:56 UTC (rev 221) +++ trunk/oai-pmh_data_provider/data_provider_web/.settings/org.eclipse.wst.common.component 2009-10-30 13:25:23 UTC (rev 222) @@ -4,7 +4,7 @@ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/> <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/> <wb-resource deploy-path="/" source-path="/src/main/webapp"/> - <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/data_provider_core/data_provider_core"> + <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/treebase/treebase"> <dependency-type>uses</dependency-type> </dependent-module> <property name="context-root" value="data_provider_web"/> Modified: trunk/oai-pmh_data_provider/data_provider_web/.settings/org.maven.ide.eclipse.prefs =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/.settings/org.maven.ide.eclipse.prefs 2009-10-27 19:54:56 UTC (rev 221) +++ trunk/oai-pmh_data_provider/data_provider_web/.settings/org.maven.ide.eclipse.prefs 2009-10-30 13:25:23 UTC (rev 222) @@ -1,8 +1,8 @@ -#Mon Oct 12 12:59:49 EDT 2009 +#Thu Oct 29 16:24:17 EDT 2009 activeProfiles= eclipse.preferences.version=1 fullBuildGoals=process-test-resources -includeModules=false +includeModules=true resolveWorkspaceProjects=true resourceFilterGoals=process-resources resources\:testResources skipCompilerPlugin=true Modified: trunk/oai-pmh_data_provider/data_provider_web/pom.xml =================================================================== --- trunk/oai-pmh_data_provider/data_provider_web/pom.xml 2009-10-27 19:54:56 UTC (rev 221) +++ trunk/oai-pmh_data_provider/data_provider_web/pom.xml 2009-10-30 13:25:23 UTC (rev 222) @@ -66,11 +66,11 @@ <dependencies> - <dependency> + <!-- dependency> <groupId>org.treebase.oai</groupId> <artifactId>data_provider_core</artifactId> <version>0.0.1-SNAPSHOT</version> - </dependency> + </dependency --> <dependency> <groupId>javax.servlet</groupId> @@ -251,6 +251,11 @@ <artifactId>servlet-api</artifactId> <version>2.4</version> </dependency> + <dependency> + <groupId>org.cipres.treebase</groupId> + <artifactId>treebase-core</artifactId> + <version>1.0-SNAPSHOT</version> + </dependency> <!-- used by Spring framework --> <!--Older ersion not needed--> Modified: trunk/oai-pmh_data_provider/pom.xml =================================================================== --- trunk/oai-pmh_data_provider/pom.xml 2009-10-27 19:54:56 UTC (rev 221) +++ trunk/oai-pmh_data_provider/pom.xml 2009-10-30 13:25:23 UTC (rev 222) @@ -47,7 +47,7 @@ </license> </licenses> <modules> - <module>data_provider_core</module> + <!-- module>data_provider_core</module --> <module>data_provider_web</module> </modules> <pluginRepositories> @@ -154,11 +154,11 @@ <dependencyManagement> <dependencies> - <dependency> + <!-- dependency> <groupId>org.treebase.oai</groupId> <artifactId>data_provider_core</artifactId> <version>${project.version}</version> - </dependency> + </dependency --> <dependency> <groupId>org.treebase.oai</groupId> <artifactId>data_provider_web</artifactId> This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site. |