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 2013/10/10 07:22:43 UTC
svn commit: r1530858 - in /juddi/trunk:
juddi-core/src/main/java/org/apache/juddi/api/impl/
juddi-core/src/main/java/org/apache/juddi/api/util/ juddiv3-war/
juddiv3-war/JAX-WS/JBossWS-CXF/WEB-INF/ juddiv3-war/JPA/OpenJPA-JBossAS7Up/
juddiv3-war/JPA/Ope...
Author: kstam
Date: Thu Oct 10 05:22:42 2013
New Revision: 1530858
URL: http://svn.apache.org/r1530858
Log:
JUDDI-660 fixing issue with mbean (we should put the classname not the classinstance in the map)
Added:
juddi/trunk/juddiv3-war/JPA/OpenJPA-JBossAS7Up/
juddi/trunk/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/
juddi/trunk/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/
juddi/trunk/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/
juddi/trunk/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/orm.xml.example
juddi/trunk/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml
juddi/trunk/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/log4j.properties
Modified:
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/ServiceCounterLifecycleResource.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java
juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/util/SubscriptionListenerQuery.java
juddi/trunk/juddiv3-war/JAX-WS/JBossWS-CXF/WEB-INF/web.xml
juddi/trunk/juddiv3-war/pom.xml
juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/ServiceCounterLifecycleResource.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/ServiceCounterLifecycleResource.java?rev=1530858&r1=1530857&r2=1530858&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/ServiceCounterLifecycleResource.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/ServiceCounterLifecycleResource.java Thu Oct 10 05:22:42 2013
@@ -18,9 +18,9 @@ public class ServiceCounterLifecycleReso
static Map<String, UDDIServiceCounter> serviceCounters =
new HashMap<String, UDDIServiceCounter>();
- static Map implForQuery = new HashMap<String, List<String>>();
+ static Map<String, List<String>> implForQuery = new HashMap<String, List<String>>();
- public static String getObjectName(Class klass) {
+ public static String getObjectName(Class<?> klass) {
StringBuffer objectName = new StringBuffer("portType=" + klass.toString());
return objectName.toString();
}
@@ -29,20 +29,20 @@ public class ServiceCounterLifecycleReso
synchronized (implForQuery) {
if (implForQuery.isEmpty()) {
implForQuery = new HashMap<String, List<String>>();
- implForQuery.put(UDDICustodyTransferImpl.class, CustodyTransferQuery.getQueries());
- implForQuery.put(UDDIInquiryImpl.class, InquiryQuery.getQueries());
- implForQuery.put(UDDIPublicationImpl.class, PublicationQuery.getQueries());
- implForQuery.put(UDDIReplicationImpl.class, ReplicationQuery.getQueries());
- implForQuery.put(UDDISecurityImpl.class, SecurityQuery.getQueries());
- implForQuery.put(UDDISubscriptionImpl.class, SubscriptionQuery.getQueries());
- implForQuery.put(UDDISubscriptionListenerImpl.class, SubscriptionListenerQuery.getQueries());
- implForQuery.put(UDDIValueSetCachingImpl.class, ValueSetCachingQuery.getQueries());
- implForQuery.put(UDDIValueSetValidationImpl.class, ValueSetValidationQuery.getQueries());
+ implForQuery.put(UDDICustodyTransferImpl.class.getName(), CustodyTransferQuery.getQueries());
+ implForQuery.put(UDDIInquiryImpl.class.getName(), InquiryQuery.getQueries());
+ implForQuery.put(UDDIPublicationImpl.class.getName(), PublicationQuery.getQueries());
+ implForQuery.put(UDDIReplicationImpl.class.getName(), ReplicationQuery.getQueries());
+ implForQuery.put(UDDISecurityImpl.class.getName(), SecurityQuery.getQueries());
+ implForQuery.put(UDDISubscriptionImpl.class.getName(), SubscriptionQuery.getQueries());
+ implForQuery.put(UDDISubscriptionListenerImpl.class.getName(), SubscriptionListenerQuery.getQueries());
+ implForQuery.put(UDDIValueSetCachingImpl.class.getName(), ValueSetCachingQuery.getQueries());
+ implForQuery.put(UDDIValueSetValidationImpl.class.getName(), ValueSetValidationQuery.getQueries());
}
}
}
- public static UDDIServiceCounter getServiceCounter(Class klass) {
+ public static UDDIServiceCounter getServiceCounter(Class<?> klass) {
if (implForQuery.isEmpty()) {
initQuery();
}
@@ -52,7 +52,7 @@ public class ServiceCounterLifecycleReso
UDDIServiceCounter serviceCounter = serviceCounters.get(objectName);
if (serviceCounter == null) {
UDDIServiceCounter uddiServiceCounter = new UDDIServiceCounter();
- uddiServiceCounter.initList(klass, (List<String>)implForQuery.get(klass));
+ uddiServiceCounter.initList(klass, (List<String>)implForQuery.get(klass.getName()));
uddiServiceCounter.registerMBean();
serviceCounters.put(objectName, uddiServiceCounter);
return uddiServiceCounter;
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java?rev=1530858&r1=1530857&r2=1530858&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIInquiryImpl.java Thu Oct 10 05:22:42 2013
@@ -76,7 +76,7 @@ public class UDDIInquiryImpl extends Aut
public UDDIInquiryImpl() {
super();
- serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(this.getClass());
+ serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(UDDIInquiryImpl.class);
}
public BindingDetail findBinding(FindBinding body)
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java?rev=1530858&r1=1530857&r2=1530858&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIPublicationImpl.java Thu Oct 10 05:22:42 2013
@@ -86,7 +86,7 @@ public class UDDIPublicationImpl extends
public UDDIPublicationImpl() {
super();
- serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(this.getClass());
+ serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(UDDIPublicationImpl.class);
}
public void addPublisherAssertions(AddPublisherAssertions body)
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java?rev=1530858&r1=1530857&r2=1530858&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDIReplicationImpl.java Thu Oct 10 05:22:42 2013
@@ -45,7 +45,7 @@ public class UDDIReplicationImpl extends
public UDDIReplicationImpl() {
super();
- serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(this.getClass());
+ serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(UDDIReplicationImpl.class);
}
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java?rev=1530858&r1=1530857&r2=1530858&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/impl/UDDISecurityImpl.java Thu Oct 10 05:22:42 2013
@@ -55,7 +55,7 @@ public class UDDISecurityImpl extends Au
public UDDISecurityImpl() {
super();
- serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(this.getClass());
+ serviceCounter = ServiceCounterLifecycleResource.getServiceCounter(UDDISecurityImpl.class);
}
public void discardAuthToken(DiscardAuthToken body)
Modified: juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/util/SubscriptionListenerQuery.java
URL: http://svn.apache.org/viewvc/juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/util/SubscriptionListenerQuery.java?rev=1530858&r1=1530857&r2=1530858&view=diff
==============================================================================
--- juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/util/SubscriptionListenerQuery.java (original)
+++ juddi/trunk/juddi-core/src/main/java/org/apache/juddi/api/util/SubscriptionListenerQuery.java Thu Oct 10 05:22:42 2013
@@ -31,12 +31,12 @@ public enum SubscriptionListenerQuery im
}
}
- public static List getQueries() {
+ public static List<String> getQueries() {
if (_subscriptionListenerQueries == null) {
initSubscriptionListenerQueries();
}
- List list = new ArrayList<String>(_subscriptionListenerQueries.keySet());
+ List<String> list = new ArrayList<String>(_subscriptionListenerQueries.keySet());
return list;
}
Modified: juddi/trunk/juddiv3-war/JAX-WS/JBossWS-CXF/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/JAX-WS/JBossWS-CXF/WEB-INF/web.xml?rev=1530858&r1=1530857&r2=1530858&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/JAX-WS/JBossWS-CXF/WEB-INF/web.xml (original)
+++ juddi/trunk/juddiv3-war/JAX-WS/JBossWS-CXF/WEB-INF/web.xml Thu Oct 10 05:22:42 2013
@@ -32,7 +32,7 @@
<servlet>
<servlet-name>RegistryServlet</servlet-name>
<display-name>Registry Servlet</display-name>
- <servlet-class>org.apache.juddi.RegistryServlet</servlet-class>
+ <servlet-class>org.apache.juddi.servlets.RegistryServlet</servlet-class>
<load-on-startup>1</load-on-startup>
</servlet>
<servlet>
Added: juddi/trunk/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/orm.xml.example
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/orm.xml.example?rev=1530858&view=auto
==============================================================================
--- juddi/trunk/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/orm.xml.example (added)
+++ juddi/trunk/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/orm.xml.example Thu Oct 10 05:22:42 2013
@@ -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>
Added: juddi/trunk/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml?rev=1530858&view=auto
==============================================================================
--- juddi/trunk/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml (added)
+++ juddi/trunk/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/META-INF/persistence.xml Thu Oct 10 05:22:42 2013
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd"
+ version="1.0">
+ <persistence-unit name="juddiDatabase" transaction-type="RESOURCE_LOCAL">
+ <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>
+ <non-jta-data-source>java:comp/env/jdbc/JuddiDS</non-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.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>
+ <properties>
+ <property name="openjpa.jdbc.SynchronizeMappings" value="buildSchema(SchemaAction='add')"/>
+ <property name="openjpa.Log" value="DefaultLevel=WARN, Tool=INFO"/>
+ <property name="openjpa.jdbc.UpdateManager" value="operation-order"/>
+ <property name="openjpa.jdbc.DBDictionary" value="derby"/>
+ <!-- dialects: derby, postgres, mysql, oracle, sybase, sqlserver
+ for a complete list check the OpenJPA documentation -->
+ <property name="openjpa.RuntimeUnenhancedClasses" value="warn"/>
+ <property name="openjpa.Compatibility" value="CheckDatabaseForCascadePersistToDetachedEntity=true"/>
+ </properties>
+ </persistence-unit>
+</persistence>
Added: juddi/trunk/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/log4j.properties
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/log4j.properties?rev=1530858&view=auto
==============================================================================
--- juddi/trunk/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/log4j.properties (added)
+++ juddi/trunk/juddiv3-war/JPA/OpenJPA-JBossAS7Up/WEB-INF/classes/log4j.properties Thu Oct 10 05:22:42 2013
@@ -0,0 +1,25 @@
+
+log4j.rootLogger=INFO, logfile
+
+# in case any output is given to stdout, format it
+log4j.appender.stdout=org.apache.log4j.ConsoleAppender
+log4j.appender.stdout.layout=org.apache.log4j.PatternLayout
+log4j.appender.stdout.layout.ConversionPattern=%d %p [%c] - %m%n
+
+log4j.appender.logfile=org.apache.log4j.RollingFileAppender
+log4j.appender.logfile.File=${catalina.home}/logs/juddi.log
+log4j.appender.logfile.MaxFileSize=512MB
+# Keep three backup files.
+log4j.appender.logfile.MaxBackupIndex=3
+# Pattern to output: date priority [category] - message
+log4j.appender.logfile.layout=org.apache.log4j.PatternLayout
+log4j.appender.logfile.layout.ConversionPattern=%d %p [%c] - %m%n
+
+#log4j.category.org.springframework.beans.property editors.CustomDateEditor=DEBUG
+
+log4j.debug=false
+
+# showing sql
+#log4j.category.org.hibernate.hql.ast.QueryTranslatorImpl=DEBUG
+#log4j.category.org.hibernate.SQL=DEBUG
+#log4j.category.org.hibernate.loader.hql.QueryLoad er=DEBUG
Modified: juddi/trunk/juddiv3-war/pom.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/juddiv3-war/pom.xml?rev=1530858&r1=1530857&r2=1530858&view=diff
==============================================================================
--- juddi/trunk/juddiv3-war/pom.xml (original)
+++ juddi/trunk/juddiv3-war/pom.xml Thu Oct 10 05:22:42 2013
@@ -282,7 +282,7 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
+ <dependency>
<artifactId>juddi-rest-cxf</artifactId>
<groupId>org.apache.juddi</groupId>
<version>${project.version}</version>
@@ -432,5 +432,53 @@
</dependency>
</dependencies>
</profile>
+ <profile>
+ <id>openjpa-jboss7up</id>
+ <activation>
+ <activeByDefault>false</activeByDefault>
+ </activation>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-war-plugin</artifactId>
+ <configuration>
+ <webResources>
+ <resource>
+ <directory>JPA/OpenJPA-JBossAs7Up</directory>
+ </resource>
+ <resource>
+ <directory>JAX-WS/JBossWS-CXF</directory>
+ </resource>
+ </webResources>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <artifactId>juddi-core-openjpa</artifactId>
+ <groupId>org.apache.juddi</groupId>
+ <version>${project.version}</version>
+ <exclusions>
+ <exclusion>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <artifactId>juddi-rest-cxf</artifactId>
+ <groupId>org.apache.juddi</groupId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.persistence</groupId>
+ <artifactId>persistence-api</artifactId>
+ <version>1.0</version>
+ <scope>provided</scope>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
Modified: juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml
URL: http://svn.apache.org/viewvc/juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml?rev=1530858&r1=1530857&r2=1530858&view=diff
==============================================================================
--- juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml (original)
+++ juddi/trunk/uddi-tck/src/main/resources/META-INF/uddi.xml Thu Oct 10 05:22:42 2013
@@ -10,7 +10,7 @@
<description>Main jUDDI node</description>
<properties>
<property name="serverName" value="localhost" />
- <property name="serverPort" value="8880" />
+ <property name="serverPort" value="8080" />
<!-- for UDDI nodes that use HTTP u/p, using the following
<property name="basicAuthUsername" value="root" />
<property name="basicAuthPassword" value="password" />
@@ -32,6 +32,7 @@
<subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription</subscriptionUrl>
<subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/subscription-listener</subscriptionListenerUrl>
<juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/juddi-api</juddiApiUrl>
+
<!-- AXIS JAX-WS Transport
<proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
<custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/services/UDDICustodyTransferService</custodyTransferUrl>
@@ -42,7 +43,16 @@
<subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/services/UDDISubscriptionListenerService</subscriptionListenerUrl>
<juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/services/JUDDIApiService</juddiApiUrl>
-->
-
+ <!-- EAP JAX-WS Transport
+ <proxyTransport>org.apache.juddi.v3.client.transport.JAXWSTransport</proxyTransport>
+ <custodyTransferUrl>http://${serverName}:${serverPort}/juddiv3/UDDICustodyTransferService</custodyTransferUrl>
+ <inquiryUrl>http://${serverName}:${serverPort}/juddiv3/UDDIInquiryService</inquiryUrl>
+ <publishUrl>http://${serverName}:${serverPort}/juddiv3/UDDIPublicationService</publishUrl>
+ <securityUrl>http://${serverName}:${serverPort}/juddiv3/UDDISecurityService</securityUrl>
+ <subscriptionUrl>http://${serverName}:${serverPort}/juddiv3/UDDISubscriptionService</subscriptionUrl>
+ <subscriptionListenerUrl>http://${serverName}:${serverPort}/juddiv3/UDDISubscriptionListenerService</subscriptionListenerUrl>
+ <juddiApiUrl>http://${serverName}:${serverPort}/juddiv3/JUDDIApiService</juddiApiUrl>
+ -->
<!-- In VM Transport Settings
<proxyTransport>org.apache.juddi.v3.client.transport.InVMTransport</proxyTransport>
<custodyTransferUrl>org.apache.juddi.api.impl.UDDICustodyTransferImpl</custodyTransferUrl>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@juddi.apache.org
For additional commands, e-mail: commits-help@juddi.apache.org