[jboss-svn-commits] JBL Code SVN: r26434 - in labs/jbossesb/workspace/systinet/product: rosetta and 2 other directories.
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri May 8 12:06:33 EDT 2009
Author: tcunning
Date: 2009-05-08 12:06:33 -0400 (Fri, 08 May 2009)
New Revision: 26434
Modified:
labs/jbossesb/workspace/systinet/product/build-distr.xml
labs/jbossesb/workspace/systinet/product/ivy.xml
labs/jbossesb/workspace/systinet/product/rosetta/aop/resources/META-INF/jboss-aop.xml
labs/jbossesb/workspace/systinet/product/rosetta/build.xml
labs/jbossesb/workspace/systinet/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
Log:
Use scout-1.0 rather than a SNAPSHOT.
Modified: labs/jbossesb/workspace/systinet/product/build-distr.xml
===================================================================
--- labs/jbossesb/workspace/systinet/product/build-distr.xml 2009-05-08 13:32:30 UTC (rev 26433)
+++ labs/jbossesb/workspace/systinet/product/build-distr.xml 2009-05-08 16:06:33 UTC (rev 26434)
@@ -106,7 +106,7 @@
<fileset dir="${lib.dir}" includes="scout-*.jar"/>
-->
<!-- scout -->
- <fileset dir="${lib.ext.dir}" includes="scout-*.jar"/>
+ <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"/>
Modified: labs/jbossesb/workspace/systinet/product/ivy.xml
===================================================================
--- labs/jbossesb/workspace/systinet/product/ivy.xml 2009-05-08 13:32:30 UTC (rev 26433)
+++ labs/jbossesb/workspace/systinet/product/ivy.xml 2009-05-08 16:06:33 UTC (rev 26434)
@@ -23,11 +23,11 @@
<!-- Only declaring a direct dependency on jaxr-api because there's an issue with
the scout-1.0rc2 pom in the repo. It declares a dep on an unavailable (easily)
SNAPSHOT version. -->
- <dependency org="org.apache.ws.scout" name="jaxr-api" rev="1.0rc2">
+ <dependency org="org.apache.ws.scout" name="jaxr-api" rev="1.0">
<exclude org="axis" module="axis"/>
<exclude org="geronimo-spec" module="geronimo-spec-activation"/>
</dependency>
- <dependency org="org.apache.ws.scout" name="scout" rev="1.0rc2">
+ <dependency org="org.apache.ws.scout" name="scout" rev="1.0">
<exclude org="axis" module="axis"/>
<exclude org="geronimo-spec" module="geronimo-spec-activation"/>
</dependency>
Modified: labs/jbossesb/workspace/systinet/product/rosetta/aop/resources/META-INF/jboss-aop.xml
===================================================================
--- labs/jbossesb/workspace/systinet/product/rosetta/aop/resources/META-INF/jboss-aop.xml 2009-05-08 13:32:30 UTC (rev 26433)
+++ labs/jbossesb/workspace/systinet/product/rosetta/aop/resources/META-INF/jboss-aop.xml 2009-05-08 16:06:33 UTC (rev 26434)
@@ -6,10 +6,6 @@
<aop>
<aspect class="org.jboss.internal.soa.esb.services.registry.aspect.ScoutAspect" scope="PER_VM"/>
<aspect class="org.jboss.internal.soa.esb.services.registry.aspect.JUDDIAspect" scope="PER_VM"/>
-
- <bind pointcut="withincode(* org.apache.ws.scout.registry.BusinessQueryManagerImpl->findServiceBindings(..)) AND call(* org.apache.ws.scout.registry.BusinessQueryManagerImpl->getRegistryObject(..))">
- <advice name="getRegistryObject" aspect="org.jboss.internal.soa.esb.services.registry.aspect.ScoutAspect"/>
- </bind>
<bind pointcut="execution(* org.apache.juddi.util.xml.XMLUtils->getText(..))">
<advice name="getText" aspect="org.jboss.internal.soa.esb.services.registry.aspect.JUDDIAspect"/>
Modified: labs/jbossesb/workspace/systinet/product/rosetta/build.xml
===================================================================
--- labs/jbossesb/workspace/systinet/product/rosetta/build.xml 2009-05-08 13:32:30 UTC (rev 26433)
+++ labs/jbossesb/workspace/systinet/product/rosetta/build.xml 2009-05-08 16:06:33 UTC (rev 26434)
@@ -5,6 +5,8 @@
<property name="org.jboss.esb.rosetta.distrib.dir" location="${org.jboss.esb.internal.dest}/jbossesb"/>
<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.scout.classes.dir" location="${org.jboss.esb.rosetta.classes.dir}-scout-aopc"/>
+ <property name="org.jboss.esb.rosetta.aopc.juddi.classes.dir" location="${org.jboss.esb.rosetta.classes.dir}-juddi-aopc"/>
<property name="org.jboss.esb.rosetta.src.dir" location="src"/>
<property name="org.jboss.esb.root.dir" location="../"/>
<property name="gendir" location="${org.jboss.esb.internal.dest}/schema-model" />
@@ -173,6 +175,30 @@
<target name="aop" depends="aop-jar">
<taskdef name="aopc" classname="org.jboss.aop.ant.AopC" classpathref="aop-classpath"/>
+
+ <delete dir="${org.jboss.esb.rosetta.aopc.scout.classes.dir}" quiet="true"/>
+ <delete dir="${org.jboss.esb.rosetta.aopc.juddi.classes.dir}" quiet="true"/>
+ <mkdir dir="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
+ <mkdir dir="${org.jboss.esb.rosetta.aopc.juddi.classes.dir}"/>
+
+ <unzip src="${org.jboss.esb.lib.dir}/scout-1.0.jar" dest="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
+ <unzip src="${org.jboss.esb.lib.dir}/juddi-2.0rc5.jar" dest="${org.jboss.esb.rosetta.aopc.juddi.classes.dir}"/>
+
+ <aopc compilerclasspathref="aop-classpath">
+ <classpath path="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
+ <src path="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
+ <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.juddi.classes.dir}"/>
+ <src path="${org.jboss.esb.rosetta.aopc.juddi.classes.dir}"/>
+ <include name="org/apache/juddi/util/xml/XMLUtils.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}/scout-1.0.aop.jar" basedir="${org.jboss.esb.rosetta.aopc.scout.classes.dir}"/>
+ <zip destfile="${org.jboss.esb.aoplib.dir}/juddi-2.0rc5.aop.jar" basedir="${org.jboss.esb.rosetta.aopc.juddi.classes.dir}"/>
</target>
<target name="aop-jar" depends="aop-compile">
Modified: labs/jbossesb/workspace/systinet/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java
===================================================================
--- labs/jbossesb/workspace/systinet/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2009-05-08 13:32:30 UTC (rev 26433)
+++ labs/jbossesb/workspace/systinet/product/rosetta/src/org/jboss/internal/soa/esb/services/registry/JAXRRegistryImpl.java 2009-05-08 16:06:33 UTC (rev 26434)
@@ -140,6 +140,7 @@
public void registerEPR(String category, String serviceName, String serviceDescription, EPR epr, String eprDescription)
throws RegistryException
{
+ Connection connection = jaxrConnectionFactory.getConnection();
if (jbossTModel == null) {
try {
jbossTModel = getJBossESBTModel(jaxrConnectionFactory);
@@ -148,7 +149,6 @@
}
}
- Connection connection = jaxrConnectionFactory.getConnection();
try {
//Find the service
Service service = findService(category,serviceName);
@@ -774,7 +774,9 @@
for (Iterator bindIter = serviceBindings.iterator(); bindIter.hasNext();)
{
ServiceBinding binding = (ServiceBinding) bindIter.next();
- binding.getSpecificationLinks().add(jbossTModel);
+ SpecificationLink speclink = new SpecificationLinkImpl(blm);
+ speclink.setSpecificationObject(jbossTModel);
+ binding.getSpecificationLinks().add(speclink);
}
}
return serviceBindings;
More information about the jboss-svn-commits
mailing list