[jboss-svn-commits] JBL Code SVN: r30142 - in labs/jbossesb/trunk/product: install and 4 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Nov 13 14:04:14 EST 2009
Author: kevin.conner at jboss.com
Date: 2009-11-13 14:04:13 -0500 (Fri, 13 Nov 2009)
New Revision: 30142
Added:
labs/jbossesb/trunk/product/rosetta/aop/java/org/jboss/internal/soa/esb/services/registry/aspect/JUDDIScoutAspect.java
Modified:
labs/jbossesb/trunk/product/build-distr.xml
labs/jbossesb/trunk/product/install/build.xml
labs/jbossesb/trunk/product/rosetta/aop/resources/META-INF/jboss-aop.xml
labs/jbossesb/trunk/product/rosetta/build.xml
labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
Log:
Tom's fix for the scout/juddi address mismatch: JBESB-2978
Modified: labs/jbossesb/trunk/product/build-distr.xml
===================================================================
--- labs/jbossesb/trunk/product/build-distr.xml 2009-11-13 18:29:33 UTC (rev 30141)
+++ labs/jbossesb/trunk/product/build-distr.xml 2009-11-13 19:04:13 UTC (rev 30142)
@@ -93,14 +93,11 @@
<copy todir="${build.dir}/jbossesb.sar/lib">
<fileset dir="${lib.ext.dir}" includes="jbossts-common.jar"/>
<fileset dir="${build.lib.dir}" includes="jbossesb*.jar" excludes="jbossesb-registry.jar"/>
- <!-- We use AOP on scout to get around an issue, use the modified jar for now
- -->
- <fileset dir="${lib.dir}" includes="scout-*.jar"/>
<!-- xbean for reading/marchalling xml for configuration, and scout -->
<fileset dir="${lib.dir}" includes="xbean*.jar"/>
<fileset dir="${lib.dir}" includes="stax-api-*.jar"/>
<!-- jUDDI Registry, we're one -->
- <fileset dir="${aoplib.dir}" includes="juddi-client-*.jar"/>
+ <fileset dir="${aoplib.dir}" includes="juddi-client-*.jar, scout-*.jar"/>
<fileset dir="${lib.dir}" includes="uddi-ws-*.jar,commons-configuration-*.jar,commons-codec-*.jar"/>
<!-- ftp -->
<fileset dir="${lib.ext.dir}" includes="commons-net-*.jar"/>
Modified: labs/jbossesb/trunk/product/install/build.xml
===================================================================
--- labs/jbossesb/trunk/product/install/build.xml 2009-11-13 18:29:33 UTC (rev 30141)
+++ labs/jbossesb/trunk/product/install/build.xml 2009-11-13 19:04:13 UTC (rev 30142)
@@ -271,7 +271,6 @@
<!-- JUDDI V3 dependencies -->
<include name="juddi-*.aop.jar"/>
<include name="juddi-client-*.jar"/>
- <include name="scout-*.jar"/>
<include name="commons-configuration-*.jar"/>
<include name="uddi-ws-*.jar"/>
</fileset>
@@ -318,8 +317,6 @@
<exclude name="lib/groovy-all-*.jar"/>
<exclude name="lib/jbossts-common.jar"/>
<exclude name="lib/jsch-*.jar"/>
- <exclude name="lib/juddi-*.aop.jar"/>
- <exclude name="lib/juddi-client-*.jar"/>
<exclude name="lib/mina-core-*.jar"/>
<exclude name="lib/mina-filter-ssl-*.jar"/>
<exclude name="lib/milyn-*.jar"/>
@@ -328,7 +325,6 @@
<exclude name="lib/stringtemplate-*.jar"/>
<exclude name="lib/opencsv-*.jar"/>
<exclude name="lib/mvel*.jar"/>
- <exclude name="lib/scout-*.aop.jar"/>
<exclude name="lib/slf4j-api-*.jar"/>
<exclude name="lib/slf4j-log4j12-*.jar"/>
<exclude name="lib/stax-api-*.jar"/>
@@ -343,8 +339,8 @@
<exclude name="rosetta.aop"/>
<!-- JUDDI V3 dependencies -->
<exclude name="lib/juddi-*.aop.jar"/>
- <exclude name="lib/juddi-client-*.jar"/>
- <exclude name="lib/scout-*.jar"/>
+ <exclude name="lib/juddi-client-*.aop.jar"/>
+ <exclude name="lib/scout-*.aop.jar"/>
<exclude name="lib/commons-configuration-*.jar"/>
<exclude name="lib/uddi-ws-*.jar"/>
</fileset>
Added: labs/jbossesb/trunk/product/rosetta/aop/java/org/jboss/internal/soa/esb/services/registry/aspect/JUDDIScoutAspect.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/aop/java/org/jboss/internal/soa/esb/services/registry/aspect/JUDDIScoutAspect.java (rev 0)
+++ labs/jbossesb/trunk/product/rosetta/aop/java/org/jboss/internal/soa/esb/services/registry/aspect/JUDDIScoutAspect.java 2009-11-13 19:04:13 UTC (rev 30142)
@@ -0,0 +1,119 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2006, JBoss Inc., and individual contributors as indicated
+ * by the @authors tag. See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ *
+ * This is free software; you can redistribute it and/or modify it
+ * under the terms of the GNU Lesser General Public License as
+ * published by the Free Software Foundation; either version 2.1 of
+ * the License, or (at your option) any later version.
+ *
+ * This software is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+ * Lesser General Public License for more details.
+ *
+ * You should have received a copy of the GNU Lesser General Public
+ * License along with this software; if not, write to the Free
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+ */
+package org.jboss.internal.soa.esb.services.registry.aspect;
+
+import org.apache.commons.configuration.PropertiesConfiguration;
+import org.jboss.aop.joinpoint.ConstructorCalledByMethodInvocation;
+import org.jboss.aop.joinpoint.MethodInvocation;
+
+import javax.xml.registry.JAXRException;
+
+import java.util.Arrays;
+
+import javax.xml.registry.infomodel.PostalAddress;
+import org.uddi.api_v3.*;
+
+/**
+ * Aspect used to allow us to override the server configuration.
+ *
+ * @author <a href='mailto:tcunning at redhat.com'>Tom Cunningham</a>
+ */
+public class JUDDIScoutAspect
+{
+ private static ObjectFactory objectFactory = new ObjectFactory();
+
+ public static Address getAddress(final MethodInvocation invocation) throws JAXRException {
+ final Object[] args = invocation.getArguments();
+ final PostalAddress postalAddress = (PostalAddress) args[0];
+ Address address = objectFactory.createAddress();
+
+ AddressLine[] addarr = new AddressLine[7];
+
+ String stnum = postalAddress.getStreetNumber();
+ String st = postalAddress.getStreet();
+ String city = postalAddress.getCity();
+ String country = postalAddress.getCountry();
+ String code = postalAddress.getPostalCode();
+ String state = postalAddress.getStateOrProvince();
+ String type = postalAddress.getType();
+
+ AddressLine stnumAL = objectFactory.createAddressLine();
+ stnumAL.setKeyName("STREET_NUMBER");
+ if (stnum != null) {
+ stnumAL.setKeyValue(stnum);
+ stnumAL.setValue(stnum);
+ }
+ AddressLine stAL = objectFactory.createAddressLine();
+ stAL.setKeyName("STREET");
+ if (st != null) {
+ stAL.setKeyValue(st);
+ stAL.setValue(st);
+ }
+
+ AddressLine cityAL = objectFactory.createAddressLine();
+ cityAL.setKeyName("CITY");
+ if (city != null) {
+ cityAL.setKeyValue(city);
+ cityAL.setValue(city);
+ }
+
+ AddressLine countryAL = objectFactory.createAddressLine();
+ countryAL.setKeyName("COUNTRY");
+ if (country != null) {
+ countryAL.setKeyValue(country);
+ countryAL.setValue(country);
+ }
+
+ AddressLine codeAL = objectFactory.createAddressLine();
+ codeAL.setKeyName("POSTALCODE");
+ if (code != null) {
+ codeAL.setKeyValue(code);
+ codeAL.setValue(code);
+ }
+
+ AddressLine stateAL = objectFactory.createAddressLine();
+ stateAL.setKeyName("STATE");
+ if (state != null) {
+ stateAL.setKeyValue(state);
+ stateAL.setValue(state);
+ }
+
+ AddressLine typeAL = objectFactory.createAddressLine();
+ typeAL.setKeyName("TYPE");
+ if (type != null) {
+ typeAL.setKeyValue(type);
+ typeAL.setValue(type);
+ }
+
+ // Add the AddressLine to vector
+ addarr[0] = stnumAL;
+ addarr[1] = stAL;
+ addarr[2] = cityAL;
+ addarr[3] = countryAL;
+ addarr[4] = codeAL;
+ addarr[5] = stateAL;
+ addarr[6] = typeAL;
+ address.getAddressLine().addAll(Arrays.asList(addarr));
+
+ return address;
+ }
+}
Property changes on: labs/jbossesb/trunk/product/rosetta/aop/java/org/jboss/internal/soa/esb/services/registry/aspect/JUDDIScoutAspect.java
___________________________________________________________________
Name: svn:keywords
+ Rev Date
Name: svn:eol-style
+ native
Modified: labs/jbossesb/trunk/product/rosetta/aop/resources/META-INF/jboss-aop.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/aop/resources/META-INF/jboss-aop.xml 2009-11-13 18:29:33 UTC (rev 30141)
+++ labs/jbossesb/trunk/product/rosetta/aop/resources/META-INF/jboss-aop.xml 2009-11-13 19:04:13 UTC (rev 30142)
@@ -5,6 +5,7 @@
<aspect class="org.jboss.internal.soa.esb.services.registry.aspect.JUDDIClientSecurityAspect" scope="PER_VM"/>
<aspect class="org.jboss.internal.soa.esb.services.registry.aspect.JUDDIClientConfigAspect" scope="PER_VM"/>
<aspect class="org.jboss.internal.soa.esb.services.registry.aspect.JUDDIServerConfigAspect" scope="PER_VM"/>
+ <aspect class="org.jboss.internal.soa.esb.services.registry.aspect.JUDDIScoutAspect" scope="PER_VM"/>
<bind pointcut="execution(* org.apache.juddi.v3.client.transport.wrapper.UDDIInquiryService->inquire(..))">
<advice name="inquire" aspect="org.jboss.internal.soa.esb.services.registry.aspect.JUDDIClientInquiryAspect"/>
@@ -25,5 +26,9 @@
<bind pointcut="withincode(* org.apache.juddi.config.AppConfig->loadConfiguration(..)) AND call(org.apache.commons.configuration.PropertiesConfiguration->new(..))">
<advice name="getConfiguration" aspect="org.jboss.internal.soa.esb.services.registry.aspect.JUDDIServerConfigAspect"/>
</bind>
+
+ <bind pointcut="execution(* org.apache.ws.scout.util.ScoutJaxrUddiV3Helper->getAddress(..))">
+ <advice name="getAddress" aspect="org.jboss.internal.soa.esb.services.registry.aspect.JUDDIScoutAspect"/>
+ </bind>
</aop>
Modified: labs/jbossesb/trunk/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/trunk/product/rosetta/build.xml 2009-11-13 18:29:33 UTC (rev 30141)
+++ labs/jbossesb/trunk/product/rosetta/build.xml 2009-11-13 19:04:13 UTC (rev 30142)
@@ -7,12 +7,15 @@
<property name="org.jboss.esb.rosetta.classes.dir" location="${org.jboss.esb.internal.dest}/classes/rosetta"/>
<property name="org.jboss.esb.rosetta.aop.classes.dir" location="${org.jboss.esb.rosetta.classes.dir}-aop"/>
<property name="org.jboss.esb.rosetta.aopc.juddi.client.classes.dir" location="${org.jboss.esb.rosetta.classes.dir}-juddi-client-aopc"/>
+ <property name="org.jboss.esb.rosetta.aopc.scout.classes.dir" location="${org.jboss.esb.rosetta.classes.dir}-scout-aopc"/>
<property name="juddi.client.jar" value="juddi-client-3.0.0.jar"/>
<property name="juddi.client.aop.jar" value="juddi-client-3.0.0.aop.jar"/>
<property name="org.jboss.esb.rosetta.aopc.juddi.core.classes.dir" location="${org.jboss.esb.rosetta.classes.dir}-juddi-core-aopc"/>
<property name="juddi.core.jar" value="juddi-core-3.0.0.jar"/>
<property name="juddi.core.aop.jar" value="juddi-core-3.0.0.aop.jar"/>
+ <property name="scout.jar" value="scout-1.2.jar"/>
+ <property name="scout.aop.jar" value="scout-1.2.aop.jar"/>
<property name="org.jboss.esb.rosetta.src.dir" location="src"/>
<property name="org.jboss.esb.root.dir" location="../"/>
@@ -237,11 +240,14 @@
<delete dir="${org.jboss.esb.rosetta.aopc.juddi.client.classes.dir}" quiet="true"/>
<delete dir="${org.jboss.esb.rosetta.aopc.juddi.core.classes.dir}" quiet="true"/>
+ <delete dir="${org.jboss.esb.rosetta.aopc.scout.classes.dir}" quiet="true"/>
<mkdir dir="${org.jboss.esb.rosetta.aopc.juddi.client.classes.dir}"/>
<mkdir dir="${org.jboss.esb.rosetta.aopc.juddi.core.classes.dir}"/>
+ <mkdir dir="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
<unzip src="${org.jboss.esb.lib.dir}/${juddi.client.jar}" dest="${org.jboss.esb.rosetta.aopc.juddi.client.classes.dir}"/>
<unzip src="${org.jboss.esb.lib.dir}/${juddi.core.jar}" dest="${org.jboss.esb.rosetta.aopc.juddi.core.classes.dir}"/>
+ <unzip src="${org.jboss.esb.lib.dir}/${scout.jar}" dest="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
<aopc compilerclasspathref="aop-classpath">
<classpath path="${org.jboss.esb.rosetta.aopc.juddi.client.classes.dir}"/>
@@ -260,8 +266,16 @@
<aoppath path="aop/resources/META-INF/jboss-aop.xml"/>
<aopclasspath path="${org.jboss.esb.rosetta.aop.classes.dir}"/>
</aopc>
+ <aopc compilerclasspathref="aop-classpath">
+ <classpath path="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
+ <src path="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
+ <include name="org/apache/ws/scout/util/ScoutJaxrUddiV3Helper.class"/>
+ <aoppath path="aop/resources/META-INF/jboss-aop.xml"/>
+ <aopclasspath path="${org.jboss.esb.rosetta.aop.classes.dir}"/>
+ </aopc>
<zip destfile="${org.jboss.esb.aoplib.dir}/${juddi.client.aop.jar}" basedir="${org.jboss.esb.rosetta.aopc.juddi.client.classes.dir}"/>
<zip destfile="${org.jboss.esb.aoplib.dir}/${juddi.core.aop.jar}" basedir="${org.jboss.esb.rosetta.aopc.juddi.core.classes.dir}"/>
+ <zip destfile="${org.jboss.esb.aoplib.dir}/${scout.aop.jar}" basedir="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
</target>
<target name="aop-jar" depends="aop-compile">
Modified: labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
===================================================================
--- labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2009-11-13 18:29:33 UTC (rev 30141)
+++ labs/jbossesb/trunk/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2009-11-13 19:04:13 UTC (rev 30142)
@@ -79,6 +79,7 @@
private JAXRConnectionFactory jaxrConnectionFactory;
private static Concept jbossTModelXXX;
public static final String JBOSS_ESB_CATEGORY = "org.jboss.soa.esb.:category";
+ private static final String REGISTERED_BY_JBOSSESB = "Registered by JBoss ESB";
public String orgCategory;
private static final boolean isV3;
@@ -178,7 +179,13 @@
SpecificationLink sl = new SpecificationLinkImpl(blm);
sl.setSpecificationObject(jbossTModel);
serviceBinding.getSpecificationLinks().add(sl);
- serviceBinding.setDescription(blm.createInternationalString(eprDescription));
+ if (isV3) {
+ if ((eprDescription == null) || ("".equals(eprDescription))) {
+ serviceBinding.setDescription(blm.createInternationalString(REGISTERED_BY_JBOSSESB));
+ }
+ } else {
+ serviceBinding.setDescription(blm.createInternationalString(eprDescription));
+ }
serviceBindings.add(serviceBinding);
service.addServiceBindings(serviceBindings);
@@ -593,7 +600,7 @@
telephoneNumber.setType(null);
PostalAddress address = blm.createPostalAddress("3340",
"Peachtree Road, NE, Suite 1200", "Atlanta", "GA", "USA",
- "30326", "");
+ "30326", "Office");
Collection<PostalAddress> postalAddresses = new ArrayList<PostalAddress>();
postalAddresses.add(address);
Collection<EmailAddress> emailAddresses = new ArrayList<EmailAddress>();
More information about the jboss-svn-commits
mailing list