You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by tc...@apache.org on 2010/03/09 22:06:51 UTC
svn commit: r921127 - in /webservices/juddi/trunk/juddiv3-war:
persistence/juddi-orm.xml pom.xml
src/main/webapp/WEB-INF/classes/META-INF/juddi-orm.xml
Author: tcunning
Date: Tue Mar 9 21:06:51 2010
New Revision: 921127
URL: http://svn.apache.org/viewvc?rev=921127&view=rev
Log:
JUDDI-362
Only include orm.xml in the WAR if it is a hibernate WAR.
Added:
webservices/juddi/trunk/juddiv3-war/persistence/juddi-orm.xml
Removed:
webservices/juddi/trunk/juddiv3-war/src/main/webapp/WEB-INF/classes/META-INF/juddi-orm.xml
Modified:
webservices/juddi/trunk/juddiv3-war/pom.xml
Added: webservices/juddi/trunk/juddiv3-war/persistence/juddi-orm.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-war/persistence/juddi-orm.xml?rev=921127&view=auto
==============================================================================
--- webservices/juddi/trunk/juddiv3-war/persistence/juddi-orm.xml (added)
+++ webservices/juddi/trunk/juddiv3-war/persistence/juddi-orm.xml Tue Mar 9 21:06:51 2010
@@ -0,0 +1,225 @@
+<entity-mappings
+ xmlns="http://java.sun.com/xml/ns/persistence/orm"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence/orm http://java.sun.com/xml/ns/persistence/orm_1_0.xsd"
+ version="1.0">
+
+ <sequence-generator name="juddi_sequence" sequence-name="juddi_sequence"/>
+
+ <entity class="org.apache.juddi.model.Address">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.AddressLine">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.BindingDescr">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.BusinessDescr">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.BusinessIdentifier">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.BusinessName">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.CategoryBag">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.Contact">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.ContactDescr">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.DiscoveryUrl">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.Email">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.InstanceDetailsDescr">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.InstanceDetailsDocDescr">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.KeyedReference">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.KeyedReferenceGroup">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.OverviewDoc">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.OverviewDocDescr">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.PersonName">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.Phone">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.ServiceDescr">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.ServiceName">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.SubscriptionMatch">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.TmodelDescr">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.TmodelIdentifier">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.TmodelInstanceInfo">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.TmodelInstanceInfoDescr">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+ <entity class="org.apache.juddi.model.TransferTokenKey">
+ <attributes>
+ <id name="id">
+ <generated-value generator="juddi_sequence" strategy="AUTO"/>
+ </id>
+ </attributes>
+ </entity>
+
+</entity-mappings>
Modified: webservices/juddi/trunk/juddiv3-war/pom.xml
URL: http://svn.apache.org/viewvc/webservices/juddi/trunk/juddiv3-war/pom.xml?rev=921127&r1=921126&r2=921127&view=diff
==============================================================================
--- webservices/juddi/trunk/juddiv3-war/pom.xml (original)
+++ webservices/juddi/trunk/juddiv3-war/pom.xml Tue Mar 9 21:06:51 2010
@@ -173,30 +173,6 @@
</dependencies>
<build>
<finalName>juddi</finalName>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-antrun-plugin</artifactId>
- <version>1.3</version>
- <executions>
- <execution>
- <id>foo</id>
- <phase>compile</phase>
- <configuration>
- <tasks>
- <echo>persistence=${persistence}</echo>
- <copy file="${basedir}/persistence/${persistence}-persistence.xml"
- tofile="${basedir}/target/classes/META-INF/persistence.xml"
- overwrite="true" />
- </tasks>
- </configuration>
- <goals>
- <goal>run</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- </plugins>
</build>
<profiles>
<profile>
@@ -210,6 +186,35 @@
<properties>
<persistence>hibernate</persistence>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>foo</id>
+ <phase>process-classes</phase>
+ <configuration>
+ <tasks>
+ <echo>persistence=${persistence}</echo>
+ <copy file="${basedir}/persistence/${persistence}-persistence.xml"
+ tofile="${basedir}/target/classes/META-INF/persistence.xml"
+ overwrite="true" />
+ <copy file="${basedir}/persistence/juddi-orm.xml"
+ tofile="${basedir}/src/main/webapp/WEB-INF/classes/orm.xml"
+ overwrite="true" />
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
<profile>
<id>openjpa</id>
@@ -223,6 +228,33 @@
<properties>
<persistence>openjpa</persistence>
</properties>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>foo</id>
+ <phase>compile</phase>
+ <configuration>
+ <tasks>
+ <echo>persistence=${persistence}</echo>
+ <copy file="${basedir}/persistence/${persistence}-persistence.xml"
+ tofile="${basedir}/target/classes/META-INF/persistence.xml"
+ overwrite="true" />
+ <delete file="${basedir}/src/main/webapp/WEB-INF/classes/orm.xml"/>
+ </tasks>
+ </configuration>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
</profile>
</profiles>
-</project>
\ No newline at end of file
+</project>
---------------------------------------------------------------------
To unsubscribe, e-mail: juddi-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: juddi-cvs-help@ws.apache.org