You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@juddi.apache.org by ks...@apache.org on 2014/09/23 17:21:16 UTC
git commit: JUDDI-823 create profiles for wildly/EAP
Repository: juddi
Updated Branches:
refs/heads/master ea8962baf -> efc89d1c6
JUDDI-823 create profiles for wildly/EAP
Project: http://git-wip-us.apache.org/repos/asf/juddi/repo
Commit: http://git-wip-us.apache.org/repos/asf/juddi/commit/efc89d1c
Tree: http://git-wip-us.apache.org/repos/asf/juddi/tree/efc89d1c
Diff: http://git-wip-us.apache.org/repos/asf/juddi/diff/efc89d1c
Branch: refs/heads/master
Commit: efc89d1c6a1ce3c9f10b72154289b9fd557a5637
Parents: ea8962b
Author: Kurt Stam <ks...@apache.org>
Authored: Tue Sep 23 11:21:03 2014 -0400
Committer: Kurt Stam <ks...@apache.org>
Committed: Tue Sep 23 11:21:03 2014 -0400
----------------------------------------------------------------------
.../en-US/GuideHowToDeployjUDDITo.asciidoc | 38 +---
.../WEB-INF/jboss-deployment-structure.xml | 8 +
juddi-gui/pom.xml | 31 +++
juddi-gui/readme.txt | 5 +-
.../WEB-INF/classes/META-INF/orm.xml.example | 225 +++++++++++++++++++
.../WEB-INF/classes/META-INF/persistence.xml | 93 ++++++++
.../WEB-INF/jboss-deployment-structure.xml | 9 +
.../Hibernate-JBossAS7Up/WEB-INF/jboss-web.xml | 8 +
.../WEB-INF/classes/META-INF/orm.xml.example | 225 -------------------
.../WEB-INF/classes/META-INF/persistence.xml | 93 --------
.../WEB-INF/jboss-deployment-structure.xml | 9 -
.../OpenJPA-JBossAS7Up/WEB-INF/jboss-web.xml | 8 -
juddiv3-war/README.txt | 79 ++-----
juddiv3-war/pom.xml | 4 +-
14 files changed, 396 insertions(+), 439 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/juddi/blob/efc89d1c/docs/asciidoc/Guide/en-US/GuideHowToDeployjUDDITo.asciidoc
----------------------------------------------------------------------
diff --git a/docs/asciidoc/Guide/en-US/GuideHowToDeployjUDDITo.asciidoc b/docs/asciidoc/Guide/en-US/GuideHowToDeployjUDDITo.asciidoc
index cbb04bc..1483df2 100644
--- a/docs/asciidoc/Guide/en-US/GuideHowToDeployjUDDITo.asciidoc
+++ b/docs/asciidoc/Guide/en-US/GuideHowToDeployjUDDITo.asciidoc
@@ -137,44 +137,12 @@ This section describes how to deploy juddi to JBossAS 7, WildFly and JBossEAP 6
===== Hibernate and JBossWS-CXF
-This profile is not yet scripted as there is an issue with Hibernate, see JUDDI-587.
-
-===== OpenJPA and JBossWS-CXF
-
-Target platform using HSQL using OpenJPA and JBossWS-CXF. The juddiv3.war relies on the openjpa and cxf modules in the appserver.
-
+Target platform Wildfly/EAP and H2 using Hibernate and JBossWS-cxf. The juddiv3.war relies on Hibernate and JBossWS-cxf modules in the appserver. To build the correct juddiv3.war run
----
-mvn clean package -P openjpa-jboss7up
+mvn clean package -P jboss7up
----
-Then copy the `target/juddiv3.war` to the `<jboss>/standalone/deployments` directory.
-
-Not all the JBoss appservers mentioned above shipped a module for openjpa. If it did not then download the OpenJPA version that jUDDI depends on. In this case, 2.2.1.
-
-In your appserver create the following directory structure `<jboss>/modules/org/apache/openjpa/main` and the following files:
-....
-<contents of downloaded OpenJPA.zip/*.jar and OpenJPA.zip/lib/*.jar>
-<create a new file, module.xml>
-....
-where the contents of the module.xml should look like
-....
-<module xmlns="urn:jboss:module:1.1" name="org.apache.openjpa">
- <resources>
- <resource-root path="openjpa-2.2.1.jar"/>
- <resource-root path="serp-1.13.1.jar"/>
- </resources>
- <dependencies>
- <module name="javax.persistence.api"/>
- <module name="javax.transaction.api"/>
- <module name="javax.validation.api"/>
- <module name="org.apache.commons.lang"/>
- <module name="org.apache.commons.collections"/>
- <module name="org.apache.log4j"/>
- </dependencies>
-</module>
-....
-Modify the contents as required based on version information.
-
+Use the JBoss add-user.sh script to create an application user with the uddiadmin role.
=== Deploying to Glassfish
This section describes how to deploy juddi to Glassfish 2.1.1. These instructions will use CXF as a webservice framework.
http://git-wip-us.apache.org/repos/asf/juddi/blob/efc89d1c/juddi-gui/JAX-WS/CXF-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml
----------------------------------------------------------------------
diff --git a/juddi-gui/JAX-WS/CXF-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml b/juddi-gui/JAX-WS/CXF-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml
new file mode 100644
index 0000000..3da280e
--- /dev/null
+++ b/juddi-gui/JAX-WS/CXF-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml
@@ -0,0 +1,8 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-deployment-structure>
+ <deployment>
+ <dependencies>
+ <module name="org.jboss.ws.cxf.jbossws-cxf-server" />
+ </dependencies>
+ </deployment>
+</jboss-deployment-structure>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/juddi/blob/efc89d1c/juddi-gui/pom.xml
----------------------------------------------------------------------
diff --git a/juddi-gui/pom.xml b/juddi-gui/pom.xml
index 875d31e..847c63b 100644
--- a/juddi-gui/pom.xml
+++ b/juddi-gui/pom.xml
@@ -170,4 +170,35 @@ language governing permissions and * limitations under the License. * */ -->
</plugins>
</pluginManagement>
</build>
+ <profiles>
+ <profile>
+ <id>jboss7up</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <version>2.4</version>
+ <configuration>
+ <packagingExcludes>
+ WEB-INF/lib/cxf*.jar,
+ WEB-INF/lib/log4j*.jar,
+ WEB-INF/lib/commons-log*.jar,
+ WEB-INF/classes/commons*,
+ WEB-INF/classes/log*
+ </packagingExcludes>
+ <webResources>
+ <resource>
+ <directory>JAX-WS/CXF-JBossAS7Up</directory>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
http://git-wip-us.apache.org/repos/asf/juddi/blob/efc89d1c/juddi-gui/readme.txt
----------------------------------------------------------------------
diff --git a/juddi-gui/readme.txt b/juddi-gui/readme.txt
index da32cda..2f243d6 100644
--- a/juddi-gui/readme.txt
+++ b/juddi-gui/readme.txt
@@ -10,6 +10,8 @@ Pre-requists:
Build:
1) First, build the main jUDDI project.
mvn clean install
+For JBoss Wildly/EAP use
+ mvn clean install -Pjboss7up
2) Deploy
copy the war file into any J2EE container that has a soap stack that supports JAX-WS 2.2 or higher
and the servlet 2.4 API spec or higher
@@ -17,4 +19,5 @@ Build:
http://localhost:8080/juddi-gui
4) Configure
Alter the contents of juddi-gui/WEB-INF/classes/META-INF/uddi.xml as necessary.
- These can also be edited in browser via Settings > Config
\ No newline at end of file
+ These can also be edited in browser via Settings > Config
+
http://git-wip-us.apache.org/repos/asf/juddi/blob/efc89d1c/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/classes/META-INF/orm.xml.example
----------------------------------------------------------------------
diff --git a/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/classes/META-INF/orm.xml.example b/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/classes/META-INF/orm.xml.example
new file mode 100644
index 0000000..cb9c92a
--- /dev/null
+++ b/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/classes/META-INF/orm.xml.example
@@ -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 classpath:schemas/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>
http://git-wip-us.apache.org/repos/asf/juddi/blob/efc89d1c/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml b/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml
new file mode 100644
index 0000000..0033ed2
--- /dev/null
+++ b/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
+ http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
+
+ <persistence-unit name="juddiDatabase" transaction-type="RESOURCE_LOCAL">
+ <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
+ <jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source>
+ <!-- entity classes -->
+ <class>org.apache.juddi.model.Address</class>
+ <class>org.apache.juddi.model.AddressLine</class>
+ <class>org.apache.juddi.model.AuthToken</class>
+ <class>org.apache.juddi.model.BindingCategoryBag</class>
+ <class>org.apache.juddi.model.BindingDescr</class>
+ <class>org.apache.juddi.model.BindingTemplate</class>
+ <class>org.apache.juddi.model.BusinessCategoryBag</class>
+ <class>org.apache.juddi.model.BusinessDescr</class>
+ <class>org.apache.juddi.model.BusinessEntity</class>
+ <class>org.apache.juddi.model.BusinessIdentifier</class>
+ <class>org.apache.juddi.model.BusinessName</class>
+ <class>org.apache.juddi.model.BusinessService</class>
+ <class>org.apache.juddi.model.CanonicalizationMethod</class>
+ <class>org.apache.juddi.model.CategoryBag</class>
+ <class>org.apache.juddi.model.Clerk</class>
+ <class>org.apache.juddi.model.ClientSubscriptionInfo</class>
+ <class>org.apache.juddi.model.Contact</class>
+ <class>org.apache.juddi.model.ContactDescr</class>
+ <class>org.apache.juddi.model.DiscoveryUrl</class>
+ <class>org.apache.juddi.model.Email</class>
+ <class>org.apache.juddi.model.InstanceDetailsDescr</class>
+ <class>org.apache.juddi.model.InstanceDetailsDocDescr</class>
+ <class>org.apache.juddi.model.KeyedReference</class>
+ <class>org.apache.juddi.model.KeyedReferenceGroup</class>
+ <class>org.apache.juddi.model.KeyDataValue</class>
+ <class>org.apache.juddi.model.KeyInfo</class>
+ <class>org.apache.juddi.model.Node</class>
+ <class>org.apache.juddi.model.ObjectType</class>
+ <class>org.apache.juddi.model.ObjectTypeContent</class>
+ <class>org.apache.juddi.model.OverviewDoc</class>
+ <class>org.apache.juddi.model.OverviewDocDescr</class>
+ <class>org.apache.juddi.model.PersonName</class>
+ <class>org.apache.juddi.model.Phone</class>
+ <class>org.apache.juddi.model.Publisher</class>
+ <class>org.apache.juddi.model.PublisherAssertion</class>
+ <class>org.apache.juddi.model.PublisherAssertionId</class>
+ <class>org.apache.juddi.model.Reference</class>
+ <class>org.apache.juddi.model.ServiceCategoryBag</class>
+ <class>org.apache.juddi.model.ServiceDescr</class>
+ <class>org.apache.juddi.model.ServiceName</class>
+ <class>org.apache.juddi.model.ServiceProjection</class>
+ <class>org.apache.juddi.model.ServiceProjectionId</class>
+ <class>org.apache.juddi.model.Signature</class>
+ <class>org.apache.juddi.model.SignatureMethod</class>
+ <class>org.apache.juddi.model.SignatureTransform</class>
+ <class>org.apache.juddi.model.SignatureTransformDataValue</class>
+ <class>org.apache.juddi.model.SignatureValue</class>
+ <class>org.apache.juddi.model.SignedInfo</class>
+ <class>org.apache.juddi.model.Subscription</class>
+ <class>org.apache.juddi.model.SubscriptionChunkToken</class>
+ <class>org.apache.juddi.model.SubscriptionMatch</class>
+ <class>org.apache.juddi.model.TempKey</class>
+ <class>org.apache.juddi.model.TempKeyPK</class>
+ <class>org.apache.juddi.model.Tmodel</class>
+ <class>org.apache.juddi.model.TmodelCategoryBag</class>
+ <class>org.apache.juddi.model.TmodelDescr</class>
+ <class>org.apache.juddi.model.TmodelIdentifier</class>
+ <class>org.apache.juddi.model.TmodelInstanceInfo</class>
+ <class>org.apache.juddi.model.TmodelInstanceInfoDescr</class>
+ <class>org.apache.juddi.model.TransferToken</class>
+ <class>org.apache.juddi.model.TransferTokenKey</class>
+ <class>org.apache.juddi.model.UddiEntity</class>
+ <class>org.apache.juddi.model.UddiEntityPublisher</class>
+ <class>org.apache.juddi.model.ValueSetValues</class>
+
+ <class>org.apache.juddi.model.ChangeRecord</class>
+ <class>org.apache.juddi.model.CommunicationGraph</class>
+ <class>org.apache.juddi.model.Operator</class>
+ <class>org.apache.juddi.model.ReplicationConfiguration</class>
+ <class>org.apache.juddi.model.Edge</class>
+ <class>org.apache.juddi.model.ControlMessage</class>
+ <class>org.apache.juddi.model.ReplicationMessage</class>
+
+ <properties>
+ <property name="hibernate.archive.autodetection" value="class"/>
+ <property name="hibernate.hbm2ddl.auto" value="update"/>
+ <property name="hibernate.show_sql" value="false"/>
+ <property name="hibernate.listeners.envers.autoRegister" value="false" />
+ <property name="hibernate.id.new_generator_mappings" value="true" />
+ <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
+ </properties>
+ </persistence-unit>
+</persistence>
http://git-wip-us.apache.org/repos/asf/juddi/blob/efc89d1c/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml
----------------------------------------------------------------------
diff --git a/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml b/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml
new file mode 100644
index 0000000..f55959a
--- /dev/null
+++ b/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<jboss-deployment-structure>
+ <deployment>
+ <dependencies>
+ <module name="org.jboss.as.jpa" />
+ <module name="org.jboss.ws.cxf.jbossws-cxf-server" />
+ </dependencies>
+ </deployment>
+</jboss-deployment-structure>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/juddi/blob/efc89d1c/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/jboss-web.xml
----------------------------------------------------------------------
diff --git a/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/jboss-web.xml b/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/jboss-web.xml
new file mode 100644
index 0000000..a3cba11
--- /dev/null
+++ b/juddiv3-war/JPA/Hibernate-JBossAS7Up/WEB-INF/jboss-web.xml
@@ -0,0 +1,8 @@
+<jboss-web>
+ <context-root>juddiv3</context-root>
+
+ <resource-ref>
+ <res-ref-name>jdbc/juddidb</res-ref-name>
+ <jndi-name>java:jboss/datasources/ExampleDS</jndi-name>
+ </resource-ref>
+</jboss-web>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/juddi/blob/efc89d1c/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/orm.xml.example
----------------------------------------------------------------------
diff --git a/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/orm.xml.example b/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/orm.xml.example
deleted file mode 100644
index cb9c92a..0000000
--- a/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/orm.xml.example
+++ /dev/null
@@ -1,225 +0,0 @@
-<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 classpath:schemas/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>
http://git-wip-us.apache.org/repos/asf/juddi/blob/efc89d1c/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml
----------------------------------------------------------------------
diff --git a/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml b/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml
deleted file mode 100644
index 0033ed2..0000000
--- a/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml
+++ /dev/null
@@ -1,93 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence
- http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
-
- <persistence-unit name="juddiDatabase" transaction-type="RESOURCE_LOCAL">
- <provider>org.hibernate.jpa.HibernatePersistenceProvider</provider>
- <jta-data-source>java:jboss/datasources/ExampleDS</jta-data-source>
- <!-- entity classes -->
- <class>org.apache.juddi.model.Address</class>
- <class>org.apache.juddi.model.AddressLine</class>
- <class>org.apache.juddi.model.AuthToken</class>
- <class>org.apache.juddi.model.BindingCategoryBag</class>
- <class>org.apache.juddi.model.BindingDescr</class>
- <class>org.apache.juddi.model.BindingTemplate</class>
- <class>org.apache.juddi.model.BusinessCategoryBag</class>
- <class>org.apache.juddi.model.BusinessDescr</class>
- <class>org.apache.juddi.model.BusinessEntity</class>
- <class>org.apache.juddi.model.BusinessIdentifier</class>
- <class>org.apache.juddi.model.BusinessName</class>
- <class>org.apache.juddi.model.BusinessService</class>
- <class>org.apache.juddi.model.CanonicalizationMethod</class>
- <class>org.apache.juddi.model.CategoryBag</class>
- <class>org.apache.juddi.model.Clerk</class>
- <class>org.apache.juddi.model.ClientSubscriptionInfo</class>
- <class>org.apache.juddi.model.Contact</class>
- <class>org.apache.juddi.model.ContactDescr</class>
- <class>org.apache.juddi.model.DiscoveryUrl</class>
- <class>org.apache.juddi.model.Email</class>
- <class>org.apache.juddi.model.InstanceDetailsDescr</class>
- <class>org.apache.juddi.model.InstanceDetailsDocDescr</class>
- <class>org.apache.juddi.model.KeyedReference</class>
- <class>org.apache.juddi.model.KeyedReferenceGroup</class>
- <class>org.apache.juddi.model.KeyDataValue</class>
- <class>org.apache.juddi.model.KeyInfo</class>
- <class>org.apache.juddi.model.Node</class>
- <class>org.apache.juddi.model.ObjectType</class>
- <class>org.apache.juddi.model.ObjectTypeContent</class>
- <class>org.apache.juddi.model.OverviewDoc</class>
- <class>org.apache.juddi.model.OverviewDocDescr</class>
- <class>org.apache.juddi.model.PersonName</class>
- <class>org.apache.juddi.model.Phone</class>
- <class>org.apache.juddi.model.Publisher</class>
- <class>org.apache.juddi.model.PublisherAssertion</class>
- <class>org.apache.juddi.model.PublisherAssertionId</class>
- <class>org.apache.juddi.model.Reference</class>
- <class>org.apache.juddi.model.ServiceCategoryBag</class>
- <class>org.apache.juddi.model.ServiceDescr</class>
- <class>org.apache.juddi.model.ServiceName</class>
- <class>org.apache.juddi.model.ServiceProjection</class>
- <class>org.apache.juddi.model.ServiceProjectionId</class>
- <class>org.apache.juddi.model.Signature</class>
- <class>org.apache.juddi.model.SignatureMethod</class>
- <class>org.apache.juddi.model.SignatureTransform</class>
- <class>org.apache.juddi.model.SignatureTransformDataValue</class>
- <class>org.apache.juddi.model.SignatureValue</class>
- <class>org.apache.juddi.model.SignedInfo</class>
- <class>org.apache.juddi.model.Subscription</class>
- <class>org.apache.juddi.model.SubscriptionChunkToken</class>
- <class>org.apache.juddi.model.SubscriptionMatch</class>
- <class>org.apache.juddi.model.TempKey</class>
- <class>org.apache.juddi.model.TempKeyPK</class>
- <class>org.apache.juddi.model.Tmodel</class>
- <class>org.apache.juddi.model.TmodelCategoryBag</class>
- <class>org.apache.juddi.model.TmodelDescr</class>
- <class>org.apache.juddi.model.TmodelIdentifier</class>
- <class>org.apache.juddi.model.TmodelInstanceInfo</class>
- <class>org.apache.juddi.model.TmodelInstanceInfoDescr</class>
- <class>org.apache.juddi.model.TransferToken</class>
- <class>org.apache.juddi.model.TransferTokenKey</class>
- <class>org.apache.juddi.model.UddiEntity</class>
- <class>org.apache.juddi.model.UddiEntityPublisher</class>
- <class>org.apache.juddi.model.ValueSetValues</class>
-
- <class>org.apache.juddi.model.ChangeRecord</class>
- <class>org.apache.juddi.model.CommunicationGraph</class>
- <class>org.apache.juddi.model.Operator</class>
- <class>org.apache.juddi.model.ReplicationConfiguration</class>
- <class>org.apache.juddi.model.Edge</class>
- <class>org.apache.juddi.model.ControlMessage</class>
- <class>org.apache.juddi.model.ReplicationMessage</class>
-
- <properties>
- <property name="hibernate.archive.autodetection" value="class"/>
- <property name="hibernate.hbm2ddl.auto" value="update"/>
- <property name="hibernate.show_sql" value="false"/>
- <property name="hibernate.listeners.envers.autoRegister" value="false" />
- <property name="hibernate.id.new_generator_mappings" value="true" />
- <property name="hibernate.dialect" value="org.hibernate.dialect.H2Dialect"/>
- </properties>
- </persistence-unit>
-</persistence>
http://git-wip-us.apache.org/repos/asf/juddi/blob/efc89d1c/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml
----------------------------------------------------------------------
diff --git a/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml b/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml
deleted file mode 100644
index f55959a..0000000
--- a/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/jboss-deployment-structure.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<jboss-deployment-structure>
- <deployment>
- <dependencies>
- <module name="org.jboss.as.jpa" />
- <module name="org.jboss.ws.cxf.jbossws-cxf-server" />
- </dependencies>
- </deployment>
-</jboss-deployment-structure>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/juddi/blob/efc89d1c/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/jboss-web.xml
----------------------------------------------------------------------
diff --git a/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/jboss-web.xml b/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/jboss-web.xml
deleted file mode 100644
index a3cba11..0000000
--- a/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/jboss-web.xml
+++ /dev/null
@@ -1,8 +0,0 @@
-<jboss-web>
- <context-root>juddiv3</context-root>
-
- <resource-ref>
- <res-ref-name>jdbc/juddidb</res-ref-name>
- <jndi-name>java:jboss/datasources/ExampleDS</jndi-name>
- </resource-ref>
-</jboss-web>
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/juddi/blob/efc89d1c/juddiv3-war/README.txt
----------------------------------------------------------------------
diff --git a/juddiv3-war/README.txt b/juddiv3-war/README.txt
index 699f739..d3bc088 100644
--- a/juddiv3-war/README.txt
+++ b/juddiv3-war/README.txt
@@ -35,9 +35,9 @@ Both OpenJPA and Apache Axis2 are packaged up in the juddiv3.war.
mvn clean package -P hibernate-jbossws-cxf
-6. Target platform JBoss EAP 6 or comminity 7 using OpenJPA and JbossWS-cxf
+6. Target platform JBoss 5 or 6 using OpenJPA and JbossWS-cxf
-mvn clean package -P openjpa-jboss7up
+mvn clean package -P openjpa-jbossws-cxf
KNOWN ISSUES
@@ -72,70 +72,17 @@ for which there is the following workaround:
http\://www.w3.org/2000/09/xmldsig#=schema/xmldsig-core-schema.xsd
-6. Target platform JBoss 7,8,EAP-6.x running OpenJPA and CXF
-
-JBoss-7.x ships with the org.jboss.as.jpa.openjpa module. If you are running EAP-6.x you
-will have to copy this module from a JBoss-AS7.x server.
-
-a) Your modules/system/layers/base/org/jboss/as/jpa/openjpa/main directory should look
-contain: jboss-as-jpa-openjpa-7.1.1.Final.jar, module.xml with the module.xml
-<?xml version="1.0" encoding="UTF-8"?>
-
-<!-- contains the JPA integration classes for OpenJPA 2.x -->
-<module xmlns="urn:jboss:module:1.1" name="org.jboss.as.jpa.openjpa">
- <properties>
- <property name="jboss.api" value="private"/>
- </properties>
-
- <resources>
- <resource-root path="jboss-as-jpa-openjpa-7.1.1.Final.jar"/>
- <!-- Insert resources here -->
- </resources>
-
- <dependencies>
- <module name="javax.annotation.api"/>
- <module name="javax.persistence.api"/>
- <module name="javax.transaction.api"/>
-
- <module name="org.jboss.as.jpa.spi"/>
- <module name="org.jboss.logging"/>
- <module name="org.jboss.jandex"/>
-
- <module name="org.apache.openjpa" optional="true"/> <!-- org.apache.openjpa:main must be created manually with OpenJPA jars -->
- </dependencies>
-</module>
-
-b) Your
-modules/system/layers/base/org/apache/openjpa/main directory should contain the following
-files: module.xml, openjpa-2.2.1.jar, serp-1.13.1.jar, with the module.xml looking
-like
-
-<module xmlns="urn:jboss:module:1.1" name="org.apache.openjpa">
- <resources>
- <resource-root path="openjpa-2.2.1.jar"/>
- <resource-root path="serp-1.13.1.jar"/>
- </resources>
- <dependencies>
- <module name="javax.persistence.api"/>
- <module name="javax.transaction.api"/>
- <module name="javax.validation.api"/>
- <module name="org.apache.commons.lang"/>
- <module name="org.apache.commons.collections"/>
- <module name="org.apache.log4j"/>
- </dependencies>
-</module>
-
-Note that the openjpa and serp versions depend on the versions jUDDI is referencing,
-which will like be upgraded in the future.
-
-c) Now run
-
-mvn clean package -Popenjpa-jboss7up
-
-and extract the juddiv3.war to standalone/deployments/juddiv3.war. Note that by
-default jUDDI is configured to use the 'ExampleDS' H2 datasource, as configured in the
-web.xml and persistence.xml. Update these files and add your database driver for your
-database of chioce.
+6. Target platform Wildfy/EAP-6.x running Hibernate and CXF
+
+This deployment uses the hibernate and cxf modules of the appserver. Simply run
+
+mvn clean package -Pjboss7up
+
+and deploy the juddiv3.war to standalone/deployments.
+
+Note that by default jUDDI is configured to use the 'ExampleDS' H2 datasource,
+as configured in the web.xml and persistence.xml. Update these files and add your
+ database driver for your database of choice.
http://git-wip-us.apache.org/repos/asf/juddi/blob/efc89d1c/juddiv3-war/pom.xml
----------------------------------------------------------------------
diff --git a/juddiv3-war/pom.xml b/juddiv3-war/pom.xml
index 2efea8a..8ff8ff5 100644
--- a/juddiv3-war/pom.xml
+++ b/juddiv3-war/pom.xml
@@ -436,7 +436,7 @@
</dependencies>
</profile>
<profile>
- <id>openjpa-jboss7up</id>
+ <id>jboss7up</id>
<activation>
<activeByDefault>false</activeByDefault>
</activation>
@@ -458,7 +458,7 @@
</packagingExcludes>
<webResources>
<resource>
- <directory>JPA/OpenJPA-JBossAS7Up</directory>
+ <directory>JPA/Hibernate-JBossAS7Up</directory>
</resource>
<resource>
<directory>JAX-WS/CXF-JBossAS7Up</directory>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org