You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@servicemix.apache.org by gn...@apache.org on 2006/06/22 16:41:40 UTC
svn commit: r416384 - in
/incubator/servicemix/branches/servicemix-3.0-M2-incubating: ./
apache-servicemix/ apache-servicemix/src/main/release/ant/
apache-servicemix/src/main/release/examples/loan-broker/
samples/wsdl-first/ servicemix-common/src/main/...
Author: gnodet
Date: Thu Jun 22 07:41:38 2006
New Revision: 416384
URL: http://svn.apache.org/viewvc?rev=416384&view=rev
Log:
Merge a few bugs from head and fix examples
Modified:
incubator/servicemix/branches/servicemix-3.0-M2-incubating/apache-servicemix/pom.xml
incubator/servicemix/branches/servicemix-3.0-M2-incubating/apache-servicemix/src/main/release/ant/servicemix-ant-task.xml
incubator/servicemix/branches/servicemix-3.0-M2-incubating/apache-servicemix/src/main/release/ant/servicemix_ant_taskdef.properties
incubator/servicemix/branches/servicemix-3.0-M2-incubating/apache-servicemix/src/main/release/examples/loan-broker/build.xml
incubator/servicemix/branches/servicemix-3.0-M2-incubating/pom.xml
incubator/servicemix/branches/servicemix-3.0-M2-incubating/samples/wsdl-first/pom.xml
incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-common/src/main/java/org/apache/servicemix/common/BaseLifeCycle.java
incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/ExtendedXMLStreamReader.java
incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/BaseStandardMBean.java
incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/InstallComponentTask.java
incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/JbiTask.java
incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListBindingComponentsTask.java
incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceAssembliesTask.java
incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceEnginesTask.java
incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListSharedLibrariesTask.java
incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-http/src/main/java/org/apache/servicemix/http/HttpEndpoint.java
incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java
Modified: incubator/servicemix/branches/servicemix-3.0-M2-incubating/apache-servicemix/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0-M2-incubating/apache-servicemix/pom.xml?rev=416384&r1=416383&r2=416384&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0-M2-incubating/apache-servicemix/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.0-M2-incubating/apache-servicemix/pom.xml Thu Jun 22 07:41:38 2006
@@ -274,7 +274,7 @@
<artifactItem>
<groupId>org.apache.servicemix.samples</groupId>
<artifactId>wsdl-first</artifactId>
- <version>3.0-SNAPSHOT</version>
+ <version>${pom.version}</version>
<classifier>src</classifier>
<type>zip</type>
</artifactItem>
Modified: incubator/servicemix/branches/servicemix-3.0-M2-incubating/apache-servicemix/src/main/release/ant/servicemix-ant-task.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0-M2-incubating/apache-servicemix/src/main/release/ant/servicemix-ant-task.xml?rev=416384&r1=416383&r2=416384&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0-M2-incubating/apache-servicemix/src/main/release/ant/servicemix-ant-task.xml (original)
+++ incubator/servicemix/branches/servicemix-3.0-M2-incubating/apache-servicemix/src/main/release/ant/servicemix-ant-task.xml Thu Jun 22 07:41:38 2006
@@ -149,15 +149,15 @@
</target>
- <!-- shutdown-component -->
- <target name="shutdown-component" description="shut downs a particular Servicemix component.">
- <echo message=" shutdown-component" />
+ <!-- shut-down-component -->
+ <target name="shut-down-component" description="shut downs a particular Servicemix component.">
+ <echo message=" shut-down-component" />
<echo message=" shuts down a particular component (service engine or binding component) in Servicemix" />
<echo message=" host=${sm.host}" />
<echo message=" port=${sm.port}" />
<echo message=" name=${sm.component.name}" />
- <jbi-shutdown-component
+ <jbi-shut-down-component
username="${sm.username}"
password="${sm.password}"
host="${sm.host}"
@@ -231,15 +231,15 @@
/>
</target>
- <!-- shutdown-service-assembly -->
- <target name="shutdown-service-assembly" description="shuts down a particular service assembly in Servicemix.">
- <echo message=" shutdown-service-assembly" />
+ <!-- shut-down-service-assembly -->
+ <target name="shut-down-service-assembly" description="shuts down a particular service assembly in Servicemix.">
+ <echo message=" shut-down-service-assembly" />
<echo message=" shuts down a particular service assembly in Servicemix." />
<echo message=" host=${sm.host}" />
<echo message=" port=${sm.port}" />
<echo message=" name=${sm.service.assembly.name}" />
- <jbi-shutdown-service-assembly
+ <jbi-shut-down-service-assembly
username="${sm.username}"
password="${sm.password}"
host="${sm.host}"
@@ -423,18 +423,18 @@
ant -f servicemix-ant-task.xml -Dsm.component.name=componentname stop-component
----------------------------------------------------------
- target : shutdown-component
- - shutdown service engine or binding component in Servicemix.
+ target : shut-down-component
+ - shut down service engine or binding component in Servicemix.
options :
sm.username : Servicemix user name.
sm.password : Servicemix password.
sm.host : host name where Servicemix is running.
sm.port : port where Servicemix is listening.
- sm.component.name : component name, service engine or binding component to shutdown.
+ sm.component.name : component name, service engine or binding component to shut down.
Example :
- ant -f servicemix-ant-task.xml -Dsm.component.name=componentname shutdown-component
+ ant -f servicemix-ant-task.xml -Dsm.component.name=componentname shut-down-component
----------------------------------------------------------
target : deploy-service-assembly
@@ -493,18 +493,18 @@
ant -f servicemix-ant-task.xml -Dsm.service.assembly.name stop-service-assembly
----------------------------------------------------------
- target : shutdown-service-assembly
- - shutdowns service assembly in Servicemix.
+ target : shut-down-service-assembly
+ - shuts down service assembly in Servicemix.
options :
sm.username : Servicemix user name.
sm.password : Servicemix password.
sm.host : host name where Servicemix is running.
sm.port : port where Servicemix is listening.
- sm.service.assembly.name : service assembly name to shutdown.
+ sm.service.assembly.name : service assembly name to shut down.
Example :
- ant -f servicemix-ant-task.xml -Dsm.service.assembly.name shutdown-service-assembly
+ ant -f servicemix-ant-task.xml -Dsm.service.assembly.name shut-down-service-assembly
----------------------------------------------------------
target : list-service-engines
Modified: incubator/servicemix/branches/servicemix-3.0-M2-incubating/apache-servicemix/src/main/release/ant/servicemix_ant_taskdef.properties
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0-M2-incubating/apache-servicemix/src/main/release/ant/servicemix_ant_taskdef.properties?rev=416384&r1=416383&r2=416384&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0-M2-incubating/apache-servicemix/src/main/release/ant/servicemix_ant_taskdef.properties (original)
+++ incubator/servicemix/branches/servicemix-3.0-M2-incubating/apache-servicemix/src/main/release/ant/servicemix_ant_taskdef.properties Thu Jun 22 07:41:38 2006
@@ -5,12 +5,12 @@
jbi-uninstall-shared-library=org.apache.servicemix.jbi.management.task.UninstallSharedLibraryTask
jbi-start-component=org.apache.servicemix.jbi.management.task.StartComponentTask
jbi-stop-component=org.apache.servicemix.jbi.management.task.StopComponentTask
-jbi-shutdown-component=org.apache.servicemix.jbi.management.task.ShutDownComponentTask
+jbi-shut-down-component=org.apache.servicemix.jbi.management.task.ShutDownComponentTask
jbi-deploy-service-assembly=org.apache.servicemix.jbi.management.task.DeployServiceAssemblyTask
jbi-undeploy-service-assembly=org.apache.servicemix.jbi.management.task.UndeployServiceAssemblyTask
jbi-start-service-assembly=org.apache.servicemix.jbi.management.task.StartServiceAssemblyTask
jbi-stop-service-assembly=org.apache.servicemix.jbi.management.task.StopServiceAssemblyTask
-jbi-shutdown-service-assembly=org.apache.servicemix.jbi.management.task.ShutDownServiceAssemblyTask
+jbi-shut-down-service-assembly=org.apache.servicemix.jbi.management.task.ShutDownServiceAssemblyTask
jbi-list-service-engines=org.apache.servicemix.jbi.management.task.ListServiceEnginesTask
jbi-list-binding-components=org.apache.servicemix.jbi.management.task.ListBindingComponentsTask
jbi-list-shared-libraries=org.apache.servicemix.jbi.management.task.ListSharedLibrariesTask
Modified: incubator/servicemix/branches/servicemix-3.0-M2-incubating/apache-servicemix/src/main/release/examples/loan-broker/build.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0-M2-incubating/apache-servicemix/src/main/release/examples/loan-broker/build.xml?rev=416384&r1=416383&r2=416384&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0-M2-incubating/apache-servicemix/src/main/release/examples/loan-broker/build.xml (original)
+++ incubator/servicemix/branches/servicemix-3.0-M2-incubating/apache-servicemix/src/main/release/examples/loan-broker/build.xml Thu Jun 22 07:41:38 2006
@@ -23,6 +23,15 @@
<get src="http://repo.mergere.com/maven2/lingo/lingo/1.0/lingo-1.0.jar"
dest="../../lib/optional/lingo-1.0.jar"
usetimestamp="true" />
+ <get src="http://repo.mergere.com/maven2/commons-pool/commons-pool/1.2/commons-pool-1.2.jar"
+ dest="../../lib/optional/commons-pool-1.2.jar"
+ usetimestamp="true" />
+ <get src="http://repo.mergere.com/maven2/commons-collections/commons-collections/3.1/commons-collections-3.1.jar"
+ dest="../../lib/optional/commons-collections-3.1.jar"
+ usetimestamp="true" />
+ <copy todir="../../lib/optional">
+ <fileset dir="../../components/lib" includes="servicemix-components*.jar"/>
+ </copy>
<path id="javac.classpath">
<pathelement path="${comp.build.dir}"/>
Modified: incubator/servicemix/branches/servicemix-3.0-M2-incubating/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0-M2-incubating/pom.xml?rev=416384&r1=416383&r2=416384&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0-M2-incubating/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.0-M2-incubating/pom.xml Thu Jun 22 07:41:38 2006
@@ -224,6 +224,11 @@
<xfire.jsr181.api.version>1.0-M1</xfire.jsr181.api.version>
<xfire.version>1.1.1</xfire.version>
<mavenAssemblyPluginVersion>2.1</mavenAssemblyPluginVersion>
+
+ <m1.repo.dist>scp://minotaur.apache.org/www/incubator.apache.org/servicemix/dist/servicemix-3.0-M2-incubating/m1</m1.repo.dist>
+ <m2.repo.dist>scp://minotaur.apache.org/www/incubator.apache.org/servicemix/dist/servicemix-3.0-M2-incubating/m2</m2.repo.dist>
+ <site.repo.dist>scp://minotaur.apache.org/www/incubator.apache.org/servicemix/dist/servicemix-3.0-M2-incubating/site</site.repo.dist>
+ <m2.repo.url>http://incubator.apache.org/dist/servicemix-3.0-M2-incubating/m2</m2.repo.url>
</properties>
<profiles>
@@ -249,15 +254,9 @@
</snapshots>
</pluginRepository>
<pluginRepository>
- <id>apache.snapshots</id>
- <name>Maven Central Plugins Development Repository</name>
- <url>http://cvs.apache.org/maven-snapshot-repository</url>
- <snapshots>
- <enabled>true</enabled>
- </snapshots>
- <releases>
- <enabled>false</enabled>
- </releases>
+ <id>servicemix-distribution</id>
+ <name>ServiceMix distribution repo</name>
+ <url>${m2.repo.url}</url>
</pluginRepository>
</pluginRepositories>
@@ -291,6 +290,11 @@
<url>http://dist.codehaus.org</url>
<layout>legacy</layout>
</repository>
+ <repository>
+ <id>servicemix-distribution</id>
+ <name>ServiceMix distribution repo</name>
+ <url>${m2.repo.url}</url>
+ </repository>
</repositories>
<dependencies>
@@ -1699,11 +1703,11 @@
<repository>
<id>servicemix</id>
<name>Apache Release Distribution Repository</name>
- <url>scp://minotaur.apache.org/www/incubator.apache.org/servicemix/dist/servicemix-${version}/m2</url>
+ <url>${m2.repo.dist}</url>
</repository>
<site>
<id>servicemix</id>
- <url>scp://minotaur.apache.org/www/incubator.apache.org/servicemix/dist/servicemix-${version}/site</url>
+ <url>${site.repo.dist}</url>
</site>
</distributionManagement>
@@ -1778,7 +1782,7 @@
</goals>
<configuration>
<remoteRepositoryId>servicemix</remoteRepositoryId>
- <remoteRepositoryUrl>scp://minotaur.apache.org/www/incubator.apache.org/servicemix/dist/servicemix-${version}/m1</remoteRepositoryUrl>
+ <remoteRepositoryUrl>${m1.repo.dist}</remoteRepositoryUrl>
</configuration>
</execution>
</executions>
@@ -1800,4 +1804,4 @@
</plugin>
</plugins>
</reporting>
-</project>
\ No newline at end of file
+</project>
Modified: incubator/servicemix/branches/servicemix-3.0-M2-incubating/samples/wsdl-first/pom.xml
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0-M2-incubating/samples/wsdl-first/pom.xml?rev=416384&r1=416383&r2=416384&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0-M2-incubating/samples/wsdl-first/pom.xml (original)
+++ incubator/servicemix/branches/servicemix-3.0-M2-incubating/samples/wsdl-first/pom.xml Thu Jun 22 07:41:38 2006
@@ -36,8 +36,9 @@
<repositories>
<repository>
- <id>apache.snapshots</id>
- <url>http://people.apache.org/maven-snapshot-repository</url>
+ <id>servicemix-distribution</id>
+ <name>ServiceMix distribution repo</name>
+ <url>${m2.repo.url}</url>
</repository>
</repositories>
Modified: incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-common/src/main/java/org/apache/servicemix/common/BaseLifeCycle.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-common/src/main/java/org/apache/servicemix/common/BaseLifeCycle.java?rev=416384&r1=416383&r2=416384&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-common/src/main/java/org/apache/servicemix/common/BaseLifeCycle.java (original)
+++ incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-common/src/main/java/org/apache/servicemix/common/BaseLifeCycle.java Thu Jun 22 07:41:38 2006
@@ -46,7 +46,7 @@
// If we are transacted and this is a runtime exception
// try to mark transaction as rollback
if (transactionManager != null &&
- transactionManager.getStatus() != Status.STATUS_ACTIVE &&
+ transactionManager.getStatus() == Status.STATUS_ACTIVE &&
e instanceof RuntimeException) {
transactionManager.setRollbackOnly();
} else {
Modified: incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/ExtendedXMLStreamReader.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/ExtendedXMLStreamReader.java?rev=416384&r1=416383&r2=416384&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/ExtendedXMLStreamReader.java (original)
+++ incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/jaxp/ExtendedXMLStreamReader.java Thu Jun 22 07:41:38 2006
@@ -101,7 +101,7 @@
public String getNamespaceURI(String prefix) {
String uri = (String) namespaces.get(prefix);
- if (uri == null) {
+ if (uri == null && parent != null) {
uri = parent.getNamespaceURI(prefix);
}
return uri;
Modified: incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/BaseStandardMBean.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/BaseStandardMBean.java?rev=416384&r1=416383&r2=416384&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/BaseStandardMBean.java (original)
+++ incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/BaseStandardMBean.java Thu Jun 22 07:41:38 2006
@@ -55,6 +55,7 @@
import java.beans.PropertyDescriptor;
import java.lang.reflect.InvocationTargetException;
import java.util.Date;
+import java.util.Hashtable;
import java.util.Iterator;
import java.util.LinkedHashMap;
import java.util.Map;
@@ -304,7 +305,17 @@
*/
public Object invoke(String name, Object[] params, String[] signature) throws MBeanException, ReflectionException {
try {
- return MethodUtils.invokeMethod(getImplementation(), name, params);
+ Class[] parameterTypes = new Class[signature.length];
+ for (int i = 0; i < parameterTypes.length; i++) {
+ parameterTypes[i] = (Class) primitiveClasses.get(signature[i]);
+ if (parameterTypes[i] == null) {
+ parameterTypes[i] = Class.forName(signature[i]);
+ }
+ }
+ return MethodUtils.invokeMethod(getImplementation(), name, params, parameterTypes);
+ }
+ catch (ClassNotFoundException e) {
+ throw new ReflectionException(e);
}
catch (NoSuchMethodException e) {
throw new ReflectionException(e);
@@ -322,6 +333,18 @@
}
}
+ private final static Hashtable primitiveClasses = new Hashtable(8);
+ {
+ primitiveClasses.put(Boolean.TYPE.toString(), Boolean.TYPE);
+ primitiveClasses.put(Character.TYPE.toString(), Character.TYPE);
+ primitiveClasses.put(Byte.TYPE.toString(), Byte.TYPE);
+ primitiveClasses.put(Short.TYPE.toString(), Short.TYPE);
+ primitiveClasses.put(Integer.TYPE.toString(), Integer.TYPE);
+ primitiveClasses.put(Long.TYPE.toString(), Long.TYPE);
+ primitiveClasses.put(Float.TYPE.toString(), Float.TYPE);
+ primitiveClasses.put(Double.TYPE.toString(), Double.TYPE);
+ }
+
/**
* Called at registration
*
Modified: incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/InstallComponentTask.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/InstallComponentTask.java?rev=416384&r1=416383&r2=416384&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/InstallComponentTask.java (original)
+++ incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/InstallComponentTask.java Thu Jun 22 07:41:38 2006
@@ -57,7 +57,7 @@
this.paramsFile = paramsFile;
}
- public Param addParam() {
+ public Param createParam() {
Param p = new Param();
if (nestedParams == null) {
nestedParams = new ArrayList();
@@ -93,13 +93,13 @@
if (nestedParams != null) {
for (Iterator iter = nestedParams.iterator(); iter.hasNext();) {
Param p = (Param) iter.next();
- props.setProperty(p.getValue(), p.getName());
+ props.setProperty(p.getName(), p.getValue());
}
}
return props;
}
- private static class Param {
+ public static class Param {
private String name;
private String value;
public String getName() {
Modified: incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/JbiTask.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/JbiTask.java?rev=416384&r1=416383&r2=416384&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/JbiTask.java (original)
+++ incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/JbiTask.java Thu Jun 22 07:41:38 2006
@@ -82,14 +82,8 @@
* initialize the connection
* @throws BuildException
*/
- public void connect() throws BuildException {
- try {
- this.jmxConnector = getJMXConnector(getServiceURL());
- }
- catch (Throwable e) {
- log("Failed to initialize the JbiTask: " + e.getMessage(), Project.MSG_ERR);
- throw new BuildException(e);
- }
+ public void connect() throws IOException {
+ this.jmxConnector = getJMXConnector(getServiceURL());
}
@@ -267,9 +261,9 @@
*/
public void execute() throws BuildException {
AdminCommandsServiceMBean acs;
- connect();
try {
log("Retrieving remote admin interface", Project.MSG_DEBUG);
+ connect();
acs = getAdminCommandsService();
} catch (Throwable e) {
log("Error accessing ServiceMix administration: " + e.getMessage(), Project.MSG_WARN);
Modified: incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListBindingComponentsTask.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListBindingComponentsTask.java?rev=416384&r1=416383&r2=416384&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListBindingComponentsTask.java (original)
+++ incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListBindingComponentsTask.java Thu Jun 22 07:41:38 2006
@@ -30,6 +30,21 @@
private String serviceAssemblyName;
private String bindingComponentName;
private String state;
+ private String xmlOutput;
+
+ /**
+ * @return the xmlOutput
+ */
+ public String isXmlOutput() {
+ return xmlOutput;
+ }
+
+ /**
+ * @param xmlOutput the xmlOutput to set
+ */
+ public void setXmlOutput(String xmlOutput) {
+ this.xmlOutput = xmlOutput;
+ }
/**
*
@@ -102,6 +117,9 @@
*/
public void doExecute(AdminCommandsServiceMBean acs) throws Exception {
String result = acs.listComponents(true, false, true, getState(), getSharedLibraryName(), getServiceAssemblyName());
+ if (xmlOutput != null) {
+ getProject().setProperty(xmlOutput, result);
+ }
log(result, Project.MSG_WARN);
}
Modified: incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceAssembliesTask.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceAssembliesTask.java?rev=416384&r1=416383&r2=416384&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceAssembliesTask.java (original)
+++ incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceAssembliesTask.java Thu Jun 22 07:41:38 2006
@@ -29,6 +29,22 @@
private String state;
private String componentName;
private String serviceAssemblyName;
+ private String xmlOutput;
+
+ /**
+ * @return the xmlOutput
+ */
+ public String isXmlOutput() {
+ return xmlOutput;
+ }
+
+ /**
+ * @param xmlOutput the xmlOutput to set
+ */
+ public void setXmlOutput(String xmlOutput) {
+ this.xmlOutput = xmlOutput;
+ }
+
/**
*
@@ -85,6 +101,9 @@
*/
public void doExecute(AdminCommandsServiceMBean acs) throws Exception {
String result = acs.listServiceAssemblies(getState(), getComponentName(), getServiceAssemblyName());
+ if (xmlOutput != null) {
+ getProject().setProperty(xmlOutput, result);
+ }
log(result, Project.MSG_WARN);
}
Modified: incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceEnginesTask.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceEnginesTask.java?rev=416384&r1=416383&r2=416384&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceEnginesTask.java (original)
+++ incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListServiceEnginesTask.java Thu Jun 22 07:41:38 2006
@@ -29,6 +29,22 @@
private String state;
private String serviceAssemblyName;
private String sharedLibraryName;
+ private String xmlOutput;
+
+ /**
+ * @return the xmlOutput
+ */
+ public String isXmlOutput() {
+ return xmlOutput;
+ }
+
+ /**
+ * @param xmlOutput the xmlOutput to set
+ */
+ public void setXmlOutput(String xmlOutput) {
+ this.xmlOutput = xmlOutput;
+ }
+
/**
*
@@ -86,6 +102,9 @@
*/
public void doExecute(AdminCommandsServiceMBean acs) throws Exception {
String result = acs.listComponents(false, true, true, getState(), getSharedLibraryName(), getServiceAssemblyName());
+ if (xmlOutput != null) {
+ getProject().setProperty(xmlOutput, result);
+ }
log(result, Project.MSG_WARN);
}
Modified: incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListSharedLibrariesTask.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListSharedLibrariesTask.java?rev=416384&r1=416383&r2=416384&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListSharedLibrariesTask.java (original)
+++ incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-core/src/main/java/org/apache/servicemix/jbi/management/task/ListSharedLibrariesTask.java Thu Jun 22 07:41:38 2006
@@ -28,6 +28,22 @@
private String componentName;
private String sharedLibraryName;
+ private String xmlOutput;
+
+ /**
+ * @return the xmlOutput
+ */
+ public String isXmlOutput() {
+ return xmlOutput;
+ }
+
+ /**
+ * @param xmlOutput the xmlOutput to set
+ */
+ public void setXmlOutput(String xmlOutput) {
+ this.xmlOutput = xmlOutput;
+ }
+
/**
*
@@ -68,6 +84,9 @@
*/
public void doExecute(AdminCommandsServiceMBean acs) throws Exception {
String result = acs.listSharedLibraries(getComponentName(), getSharedLibraryName());
+ if (xmlOutput != null) {
+ getProject().setProperty(xmlOutput, result);
+ }
log(result, Project.MSG_WARN);
}
Modified: incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-http/src/main/java/org/apache/servicemix/http/HttpEndpoint.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-http/src/main/java/org/apache/servicemix/http/HttpEndpoint.java?rev=416384&r1=416383&r2=416384&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-http/src/main/java/org/apache/servicemix/http/HttpEndpoint.java (original)
+++ incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-http/src/main/java/org/apache/servicemix/http/HttpEndpoint.java Thu Jun 22 07:41:38 2006
@@ -240,19 +240,21 @@
}
// Add schemas to mapping
Types types = def.getTypes();
- for (Iterator it = types.getExtensibilityElements().iterator(); it.hasNext();) {
- ExtensibilityElement ee = (ExtensibilityElement) it.next();
- if (ee instanceof Schema) {
- Schema schema = (Schema) ee;
- Map schemaImports = schema.getImports();
- for (Iterator iter = schemaImports.values().iterator(); iter.hasNext();) {
- List imps = (List) iter.next();
- for (Iterator iterator = imps.iterator(); iterator.hasNext();) {
- SchemaImport schemaImport = (SchemaImport) iterator.next();
- Schema schemaImp = schemaImport.getReferencedSchema();
- String schemaLoc = schemaImport.getSchemaLocationURI();
- if (schemaLoc != null && schemaImp != null && schemaImp.getElement() != null && !URI.create(schemaLoc).isAbsolute()) {
- wsdls.put(schemaLoc, schemaImp.getElement());
+ if (types != null) {
+ for (Iterator it = types.getExtensibilityElements().iterator(); it.hasNext();) {
+ ExtensibilityElement ee = (ExtensibilityElement) it.next();
+ if (ee instanceof Schema) {
+ Schema schema = (Schema) ee;
+ Map schemaImports = schema.getImports();
+ for (Iterator iter = schemaImports.values().iterator(); iter.hasNext();) {
+ List imps = (List) iter.next();
+ for (Iterator iterator = imps.iterator(); iterator.hasNext();) {
+ SchemaImport schemaImport = (SchemaImport) iterator.next();
+ Schema schemaImp = schemaImport.getReferencedSchema();
+ String schemaLoc = schemaImport.getSchemaLocationURI();
+ if (schemaLoc != null && schemaImp != null && schemaImp.getElement() != null && !URI.create(schemaLoc).isAbsolute()) {
+ wsdls.put(schemaLoc, schemaImp.getElement());
+ }
}
}
}
Modified: incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java
URL: http://svn.apache.org/viewvc/incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java?rev=416384&r1=416383&r2=416384&view=diff
==============================================================================
--- incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java (original)
+++ incubator/servicemix/branches/servicemix-3.0-M2-incubating/servicemix-http/src/main/java/org/apache/servicemix/http/processors/ProviderProcessor.java Thu Jun 22 07:41:38 2006
@@ -93,9 +93,12 @@
} else if (exchange.getStatus() == ExchangeStatus.ERROR) {
return;
}
+ NormalizedMessage nm = exchange.getMessage("in");
+ if (nm == null) {
+ throw new IllegalStateException("Exchange has no input message");
+ }
PostMethod method = new PostMethod(relUri);
SoapMessage soapMessage = new SoapMessage();
- NormalizedMessage nm = exchange.getMessage("in");
soapHelper.getJBIMarshaler().fromNMS(soapMessage, nm);
Context context = soapHelper.createContext(soapMessage);
soapHelper.onSend(context);