Author: davsclaus
Date: Wed Jan 14 08:17:51 2009
New Revision: 734440
URL: http://svn.apache.org/viewvc?rev=734440&view=rev
Log:
Merged revisions 734422 via svnmerge from
https://svn.apache.org/repos/asf/activemq/camel/trunk
........
r734422 | davsclaus | 2009-01-14 16:46:01 +0100 (Wed, 14 Jan 2009) | 1 line
CAMEL-1257: persistence.xml should not be in camel-jpa.jar
........
Removed:
activemq/camel/branches/camel-1.x/components/camel-jpa/src/main/resources/META-INF/persistence.xml
Modified:
activemq/camel/branches/camel-1.x/ (props changed)
activemq/camel/branches/camel-1.x/components/camel-jpa/pom.xml
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Jan 14 08:17:51 2009
@@ -1 +1 @@
-/activemq/camel/trunk:732943,733749,734053,734057-734058,734064,734130,734309,734340-734342,734348
+/activemq/camel/trunk:732943,733749,734053,734057-734058,734064,734130,734309,734340-734342,734348,734422
Propchange: activemq/camel/branches/camel-1.x/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified: activemq/camel/branches/camel-1.x/components/camel-jpa/pom.xml
URL:
http://svn.apache.org/viewvc/activemq/camel/branches/camel-1.x/components/camel-jpa/pom.xml?rev=734440&r1=734439&r2=734440&view=diff
==============================================================================
--- activemq/camel/branches/camel-1.x/components/camel-jpa/pom.xml (original)
+++ activemq/camel/branches/camel-1.x/components/camel-jpa/pom.xml Wed Jan 14
08:17:51 2009
@@ -129,27 +129,15 @@
<classpath refid="cp"/>
</taskdef>
- <mkdir dir="${basedir}/target/jpa-classes"/>
<mkdir dir="${basedir}/target/jpa-test-classes"/>
-
- <openjpac directory="${basedir}/target/jpa-classes">
- <classpath refid="cp"/>
- <fileset dir="${basedir}/target/classes">
- <include name="org/apache/camel/processor/**/M*.class"/>
- </fileset>
- <config
propertiesFile="${basedir}/src/main/resources/META-INF/persistence.xml"/>
- </openjpac>
<openjpac directory="${basedir}/target/jpa-test-classes">
<classpath refid="cp"/>
- <fileset dir="${basedir}/target/test-classes">
- <include name="org/apache/camel/examples/*.class"/>
- </fileset>
- <config
propertiesFile="${basedir}/src/main/resources/META-INF/persistence.xml"/>
+ <fileset dir="${basedir}/target/classes">
+ <include
name="org/apache/camel/processor/**/MessageProcessed.class"/>
+ </fileset>
+ <config
propertiesFile="${basedir}/src/test/resources/META-INF/persistence.xml"/>
</openjpac>
- <copy overwrite="true" todir="${basedir}/target/classes">
- <fileset dir="${basedir}/target/jpa-classes"/>
- </copy>
<copy overwrite="true" todir="${basedir}/target/test-classes">
<fileset dir="${basedir}/target/jpa-test-classes"/>
</copy>
