riftsaw SVN: r1157 - in dsp/trunk: api/src/main/resources/META-INF and 7 other directories.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2010-11-25 08:01:18 -0500 (Thu, 25 Nov 2010)
New Revision: 1157
Added:
dsp/trunk/samples/deployer/pom.xml
dsp/trunk/samples/deployer/src/main/webapp/
dsp/trunk/samples/deployer/src/main/webapp/WEB-INF/lib/dsp-api-1.0.0-SNAPSHOT.jar
dsp/trunk/samples/deployer/src/main/webapp/WEB-INF/lib/dsp-jboss-1.0.0-SNAPSHOT.jar
dsp/trunk/samples/deployer/src/main/webapp/files/placeholder.txt
dsp/trunk/samples/pom.xml
Removed:
dsp/trunk/api/src/main/resources/META-INF/jboss-beans.xml
dsp/trunk/samples/deployer/src/main/resources/
dsp/trunk/samples/deployer/src/main/webapp/WEB-INF/lib/dsp-1.0.0-SNAPSHOT.jar
dsp/trunk/samples/deployer/src/main/webapp/tmp/
Modified:
dsp/trunk/pom.xml
dsp/trunk/samples/deployer/
dsp/trunk/samples/deployer/.settings/org.eclipse.wst.common.component
Log:
Add pom for building war, and other updates to get the war to deploy correctly. Issues at the moment are, (1) fact that commons+dsp jars need to be included in project for use as Eclipse Web Project (deployment to server from Eclipse), and (2) war contains many jars (jboss, javassit, xml, etc) not sure where it is picking these up from.
Deleted: dsp/trunk/api/src/main/resources/META-INF/jboss-beans.xml
===================================================================
--- dsp/trunk/api/src/main/resources/META-INF/jboss-beans.xml 2010-11-25 10:53:34 UTC (rev 1156)
+++ dsp/trunk/api/src/main/resources/META-INF/jboss-beans.xml 2010-11-25 13:01:18 UTC (rev 1157)
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<deployment xmlns="urn:jboss:bean-deployer:2.0">
-
- <!--
- Locate the single instance of the kernel
- -->
- <bean name="org.jboss.soa.dsp:service=KernelLocator"
- class="org.jboss.soa.dsp.server.jboss.KernelLocator">
- <property name="kernel">
- <inject bean="jboss.kernel:service=Kernel" />
- </property>
- </bean>
-
- <!--
- ServerConfig
- -->
- <bean name="org.jboss.soa.dsp:service=ServerConfig"
- class="org.jboss.soa.dsp.server.jboss.ServerConfigImpl">
- <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
- <property name="webServiceHost">${jboss.bind.address}</property>
- </bean>
-
-
-</deployment>
Modified: dsp/trunk/pom.xml
===================================================================
--- dsp/trunk/pom.xml 2010-11-25 10:53:34 UTC (rev 1156)
+++ dsp/trunk/pom.xml 2010-11-25 13:01:18 UTC (rev 1157)
@@ -24,6 +24,7 @@
<modules>
<module>api</module>
<module>jboss</module>
+ <module>samples</module>
</modules>
Property changes on: dsp/trunk/samples/deployer
___________________________________________________________________
Name: svn:ignore
+ build
target
Modified: dsp/trunk/samples/deployer/.settings/org.eclipse.wst.common.component
===================================================================
--- dsp/trunk/samples/deployer/.settings/org.eclipse.wst.common.component 2010-11-25 10:53:34 UTC (rev 1156)
+++ dsp/trunk/samples/deployer/.settings/org.eclipse.wst.common.component 2010-11-25 13:01:18 UTC (rev 1157)
@@ -2,7 +2,7 @@
<project-modules id="moduleCoreId" project-version="1.5.0">
<wb-module deploy-name="DSPExample">
<wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
- <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+ <wb-resource deploy-path="/" source-path="/src/main/webapp"/>
<property name="context-root" value="DSPExample"/>
<property name="java-output-path" value="/DSPExample/build/classes"/>
</wb-module>
Added: dsp/trunk/samples/deployer/pom.xml
===================================================================
--- dsp/trunk/samples/deployer/pom.xml (rev 0)
+++ dsp/trunk/samples/deployer/pom.xml 2010-11-25 13:01:18 UTC (rev 1157)
@@ -0,0 +1,58 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.soa.dsp.samples</groupId>
+ <artifactId>dsp-example-deployer</artifactId>
+ <packaging>war</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>SOA::DSP::Samples::Deployer</name>
+
+ <parent>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>samples</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>commons-fileupload</groupId>
+ <artifactId>commons-fileupload</artifactId>
+ <version>1.2.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-io</groupId>
+ <artifactId>commons-io</artifactId>
+ <version>1.3.2</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.5</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-api</artifactId>
+ <version>${dsp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-jboss</artifactId>
+ <version>${dsp.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <finalName>dsp-example-deployer</finalName>
+ </build>
+
+</project>
Copied: dsp/trunk/samples/deployer/src/main/webapp (from rev 1156, dsp/trunk/samples/deployer/src/main/resources)
Deleted: dsp/trunk/samples/deployer/src/main/webapp/WEB-INF/lib/dsp-1.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Added: dsp/trunk/samples/deployer/src/main/webapp/WEB-INF/lib/dsp-api-1.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: dsp/trunk/samples/deployer/src/main/webapp/WEB-INF/lib/dsp-api-1.0.0-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: dsp/trunk/samples/deployer/src/main/webapp/WEB-INF/lib/dsp-jboss-1.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: dsp/trunk/samples/deployer/src/main/webapp/WEB-INF/lib/dsp-jboss-1.0.0-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: dsp/trunk/samples/deployer/src/main/webapp/files/placeholder.txt
===================================================================
--- dsp/trunk/samples/deployer/src/main/webapp/files/placeholder.txt (rev 0)
+++ dsp/trunk/samples/deployer/src/main/webapp/files/placeholder.txt 2010-11-25 13:01:18 UTC (rev 1157)
@@ -0,0 +1 @@
+Placeholder to cause 'files' folder to be included in war.
\ No newline at end of file
Added: dsp/trunk/samples/pom.xml
===================================================================
--- dsp/trunk/samples/pom.xml (rev 0)
+++ dsp/trunk/samples/pom.xml 2010-11-25 13:01:18 UTC (rev 1157)
@@ -0,0 +1,21 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>samples</artifactId>
+ <packaging>pom</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>SOA::DSP::Samples</name>
+
+ <parent>
+ <groupId>org.jboss.soa</groupId>
+ <artifactId>dsp</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <modules>
+ <module>deployer</module>
+ </modules>
+
+</project>
14 years, 1 month
riftsaw SVN: r1156 - in dsp/trunk: samples and 14 other directories.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2010-11-25 05:53:34 -0500 (Thu, 25 Nov 2010)
New Revision: 1156
Added:
dsp/trunk/samples/
dsp/trunk/samples/deployer/
dsp/trunk/samples/deployer/.classpath
dsp/trunk/samples/deployer/.project
dsp/trunk/samples/deployer/.settings/
dsp/trunk/samples/deployer/.settings/.jsdtscope
dsp/trunk/samples/deployer/.settings/org.eclipse.jdt.core.prefs
dsp/trunk/samples/deployer/.settings/org.eclipse.wst.common.component
dsp/trunk/samples/deployer/.settings/org.eclipse.wst.common.project.facet.core.xml
dsp/trunk/samples/deployer/.settings/org.eclipse.wst.jsdt.ui.superType.container
dsp/trunk/samples/deployer/.settings/org.eclipse.wst.jsdt.ui.superType.name
dsp/trunk/samples/deployer/src/
dsp/trunk/samples/deployer/src/main/
dsp/trunk/samples/deployer/src/main/java/
dsp/trunk/samples/deployer/src/main/java/org/
dsp/trunk/samples/deployer/src/main/java/org/jboss/
dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/
dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/
dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/
dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/DeployServlet.java
dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/ExampleServiceProvider.java
dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/ExampleWebServiceFactory.java
dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/WSDeployer.java
dsp/trunk/samples/deployer/src/main/resources/
dsp/trunk/samples/deployer/src/main/resources/META-INF/
dsp/trunk/samples/deployer/src/main/resources/META-INF/MANIFEST.MF
dsp/trunk/samples/deployer/src/main/resources/WEB-INF/
dsp/trunk/samples/deployer/src/main/resources/WEB-INF/lib/
dsp/trunk/samples/deployer/src/main/resources/WEB-INF/lib/commons-fileupload-1.2.2.jar
dsp/trunk/samples/deployer/src/main/resources/WEB-INF/lib/commons-io-1.3.2.jar
dsp/trunk/samples/deployer/src/main/resources/WEB-INF/lib/dsp-1.0.0-SNAPSHOT.jar
dsp/trunk/samples/deployer/src/main/resources/WEB-INF/web.xml
dsp/trunk/samples/deployer/src/main/resources/files/
dsp/trunk/samples/deployer/src/main/resources/tmp/
dsp/trunk/samples/deployer/src/main/resources/upload.html
Log:
Example deployment using dsp from a servlet.
Added: dsp/trunk/samples/deployer/.classpath
===================================================================
--- dsp/trunk/samples/deployer/.classpath (rev 0)
+++ dsp/trunk/samples/deployer/.classpath 2010-11-25 10:53:34 UTC (rev 1156)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="src/main/java"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/java-1.6.0-openjdk-1.6.0.0">
+ <attributes>
+ <attribute name="owner.project.facets" value="java"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.server.core.container/org.jboss.ide.eclipse.as.core.server.runtime.runtimeTarget/JBoss 5.1 Runtime">
+ <attributes>
+ <attribute name="owner.project.facets" value="jst.web"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.web.container"/>
+ <classpathentry kind="con" path="org.eclipse.jst.j2ee.internal.module.container"/>
+ <classpathentry kind="output" path="build/classes"/>
+</classpath>
Added: dsp/trunk/samples/deployer/.project
===================================================================
--- dsp/trunk/samples/deployer/.project (rev 0)
+++ dsp/trunk/samples/deployer/.project 2010-11-25 10:53:34 UTC (rev 1156)
@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+ <name>dsp-deployer-example</name>
+ <comment></comment>
+ <projects>
+ </projects>
+ <buildSpec>
+ <buildCommand>
+ <name>org.eclipse.wst.jsdt.core.javascriptValidator</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.jdt.core.javabuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.common.project.facet.core.builder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ <buildCommand>
+ <name>org.eclipse.wst.validation.validationbuilder</name>
+ <arguments>
+ </arguments>
+ </buildCommand>
+ </buildSpec>
+ <natures>
+ <nature>org.eclipse.jem.workbench.JavaEMFNature</nature>
+ <nature>org.eclipse.wst.common.modulecore.ModuleCoreNature</nature>
+ <nature>org.eclipse.wst.common.project.facet.core.nature</nature>
+ <nature>org.eclipse.jdt.core.javanature</nature>
+ <nature>org.eclipse.wst.jsdt.core.jsNature</nature>
+ </natures>
+</projectDescription>
Added: dsp/trunk/samples/deployer/.settings/.jsdtscope
===================================================================
--- dsp/trunk/samples/deployer/.settings/.jsdtscope (rev 0)
+++ dsp/trunk/samples/deployer/.settings/.jsdtscope 2010-11-25 10:53:34 UTC (rev 1156)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+ <classpathentry kind="src" path="WebContent"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.JRE_CONTAINER"/>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.WebProject">
+ <attributes>
+ <attribute name="hide" value="true"/>
+ </attributes>
+ </classpathentry>
+ <classpathentry kind="con" path="org.eclipse.wst.jsdt.launching.baseBrowserLibrary"/>
+ <classpathentry kind="output" path=""/>
+</classpath>
Added: dsp/trunk/samples/deployer/.settings/org.eclipse.jdt.core.prefs
===================================================================
--- dsp/trunk/samples/deployer/.settings/org.eclipse.jdt.core.prefs (rev 0)
+++ dsp/trunk/samples/deployer/.settings/org.eclipse.jdt.core.prefs 2010-11-25 10:53:34 UTC (rev 1156)
@@ -0,0 +1,8 @@
+#Tue Nov 23 14:56:18 GMT 2010
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5
Added: dsp/trunk/samples/deployer/.settings/org.eclipse.wst.common.component
===================================================================
--- dsp/trunk/samples/deployer/.settings/org.eclipse.wst.common.component (rev 0)
+++ dsp/trunk/samples/deployer/.settings/org.eclipse.wst.common.component 2010-11-25 10:53:34 UTC (rev 1156)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<project-modules id="moduleCoreId" project-version="1.5.0">
+ <wb-module deploy-name="DSPExample">
+ <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/java"/>
+ <wb-resource deploy-path="/" source-path="/src/main/resources"/>
+ <property name="context-root" value="DSPExample"/>
+ <property name="java-output-path" value="/DSPExample/build/classes"/>
+ </wb-module>
+</project-modules>
Added: dsp/trunk/samples/deployer/.settings/org.eclipse.wst.common.project.facet.core.xml
===================================================================
--- dsp/trunk/samples/deployer/.settings/org.eclipse.wst.common.project.facet.core.xml (rev 0)
+++ dsp/trunk/samples/deployer/.settings/org.eclipse.wst.common.project.facet.core.xml 2010-11-25 10:53:34 UTC (rev 1156)
@@ -0,0 +1,10 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<faceted-project>
+ <runtime name="JBoss 5.1 Runtime"/>
+ <fixed facet="wst.jsdt.web"/>
+ <fixed facet="java"/>
+ <fixed facet="jst.web"/>
+ <installed facet="java" version="1.5"/>
+ <installed facet="jst.web" version="2.5"/>
+ <installed facet="wst.jsdt.web" version="1.0"/>
+</faceted-project>
Added: dsp/trunk/samples/deployer/.settings/org.eclipse.wst.jsdt.ui.superType.container
===================================================================
--- dsp/trunk/samples/deployer/.settings/org.eclipse.wst.jsdt.ui.superType.container (rev 0)
+++ dsp/trunk/samples/deployer/.settings/org.eclipse.wst.jsdt.ui.superType.container 2010-11-25 10:53:34 UTC (rev 1156)
@@ -0,0 +1 @@
+org.eclipse.wst.jsdt.launching.baseBrowserLibrary
\ No newline at end of file
Added: dsp/trunk/samples/deployer/.settings/org.eclipse.wst.jsdt.ui.superType.name
===================================================================
--- dsp/trunk/samples/deployer/.settings/org.eclipse.wst.jsdt.ui.superType.name (rev 0)
+++ dsp/trunk/samples/deployer/.settings/org.eclipse.wst.jsdt.ui.superType.name 2010-11-25 10:53:34 UTC (rev 1156)
@@ -0,0 +1 @@
+Window
\ No newline at end of file
Added: dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/DeployServlet.java
===================================================================
--- dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/DeployServlet.java (rev 0)
+++ dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/DeployServlet.java 2010-11-25 10:53:34 UTC (rev 1156)
@@ -0,0 +1,166 @@
+/*
+ * Copyright 2010 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.example;
+
+import java.io.File;
+import java.io.FileOutputStream;
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.util.Iterator;
+import java.util.List;
+import java.util.zip.ZipEntry;
+import java.util.zip.ZipInputStream;
+
+import javax.servlet.ServletConfig;
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.commons.fileupload.FileItem;
+import org.apache.commons.fileupload.FileUploadException;
+import org.apache.commons.fileupload.disk.DiskFileItemFactory;
+import org.apache.commons.fileupload.servlet.ServletFileUpload;
+
+
+public class DeployServlet extends HttpServlet {
+ private static final long serialVersionUID = 1L;
+
+ private static final String TMP_DIR_PATH = "/tmp";
+ private File tmpDir;
+ private static final String DESTINATION_DIR_PATH ="/files";
+ private File destinationDir;
+
+ public void init(ServletConfig config) throws ServletException {
+ super.init(config);
+ tmpDir = new File(TMP_DIR_PATH);
+ if(!tmpDir.isDirectory()) {
+ throw new ServletException(TMP_DIR_PATH + " is not a directory");
+ }
+ String realPath = getServletContext().getRealPath(DESTINATION_DIR_PATH);
+ destinationDir = new File(realPath);
+ if(!destinationDir.isDirectory()) {
+ throw new ServletException(DESTINATION_DIR_PATH+" is not a directory");
+ }
+
+ }
+
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ PrintWriter out = response.getWriter();
+ response.setContentType("text/html");
+ out.println("<h1>Dynamic Service Provider Example - Deployer</h1>");
+ out.println();
+
+ DiskFileItemFactory fileItemFactory = new DiskFileItemFactory ();
+ /*
+ *Set the size threshold, above which content will be stored on disk.
+ */
+ fileItemFactory.setSizeThreshold(1*1024*1024); //1 MB
+ /*
+ * Set the temporary directory to store the uploaded files of size above threshold.
+ */
+ fileItemFactory.setRepository(tmpDir);
+
+ ServletFileUpload uploadHandler = new ServletFileUpload(fileItemFactory);
+ try {
+ /*
+ * Parse the request
+ */
+ List items = uploadHandler.parseRequest(request);
+ Iterator itr = items.iterator();
+ while(itr.hasNext()) {
+ FileItem item = (FileItem) itr.next();
+ /*
+ * Handle Form Fields.
+ */
+ if(item.isFormField()) {
+ out.println("File Name = "+item.getFieldName()+", Value = "+item.getString());
+ } else if (item.getName().endsWith(".zip") == false) {
+ out.println("File must be a '.zip' archive!");
+ } else {
+ //Handle Uploaded files.
+ out.println("Uploading File: "+item.getName()+"<br>");
+
+ /*
+ * Write file to the ultimate location.
+ */
+ File file = new File(destinationDir,item.getName().substring(0, item.getName().length()-4));
+
+ file.mkdir();
+
+ File wsdlFile=unzip(out, new java.util.zip.ZipInputStream(item.getInputStream()), file.getAbsolutePath());
+
+ if (wsdlFile == null) {
+ out.println("ERROR: No WSDL definition found!!!<br>");
+ } else {
+ // Invoke dynamic service deployment mechanism
+ WSDeployer deployer=new WSDeployer();
+
+ deployer.deploy(file, wsdlFile);
+
+ }
+ }
+ out.close();
+ }
+ }catch(FileUploadException ex) {
+ log("Error encountered while parsing the request",ex);
+ } catch(Exception ex) {
+ log("Error encountered while uploading file",ex);
+ }
+
+ }
+
+ protected java.io.File unzip(PrintWriter out, ZipInputStream zis, String path) throws IOException {
+ ZipEntry ze=null;
+ java.io.File wsdlFile=null;
+
+ out.println("Unzipping file ....<br>");
+
+ while ((ze=zis.getNextEntry()) != null) {
+
+ if (ze.isDirectory()) {
+ java.io.File f=new java.io.File(path+java.io.File.separatorChar+ze.getName());
+ f.mkdirs();
+ } else {
+ out.println("Unzip: "+ze.getName()+"<br>");
+ unzipEntry(zis, ze.getName(), path);
+
+ if (ze.getName().endsWith(".wsdl")) {
+ wsdlFile = new java.io.File(path+java.io.File.separatorChar+ze.getName());
+ }
+ }
+ }
+
+ out.println("Closing zip.<br>");
+ zis.close();
+
+ return(wsdlFile);
+ }
+
+ protected void unzipEntry(ZipInputStream zis, String name, String path) throws IOException {
+ System.out.println("\t\tunzipping "+name+"<br>");
+ FileOutputStream fos = new FileOutputStream(path+java.io.File.separatorChar+name);
+ byte[] b=new byte[1024];
+ int len=0;
+
+ while ((len=zis.read(b)) != -1) {
+ fos.write(b,0,len);
+ }
+
+ fos.close();
+ }
+}
\ No newline at end of file
Added: dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/ExampleServiceProvider.java
===================================================================
--- dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/ExampleServiceProvider.java (rev 0)
+++ dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/ExampleServiceProvider.java 2010-11-25 10:53:34 UTC (rev 1156)
@@ -0,0 +1,69 @@
+/*
+ * Copyright 2010 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.example;
+
+import java.util.HashMap;
+import java.util.Map;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.soa.dsp.InvocationAdapter;
+import org.jboss.soa.dsp.MessageAdapter;
+import org.jboss.soa.dsp.ServiceProvider;
+import org.jboss.soa.dsp.ws.WSInvocationAdapter;
+import org.w3c.dom.Element;
+import org.w3c.dom.Node;
+
+public class ExampleServiceProvider implements ServiceProvider {
+
+ public void invoke(InvocationAdapter<?> arg0) throws Exception {
+ System.out.println("EXAMPLE SERVICE PROVIDER: invoke "+arg0);
+
+ arg0.createFault(null, new QName("http://www.example.org", "ExampleFault"),
+ new MessageAdapter() {
+
+ public Map<String, Node> getHeaderParts() {
+ return new HashMap<String,Node>();
+ }
+
+ public Element getMessage() {
+ Element ret=null;
+
+ try {
+ ret = javax.xml.parsers.DocumentBuilderFactory.newInstance().
+ newDocumentBuilder().newDocument().createElement("ExampleFaultDetails");
+ } catch(Exception e) {
+ e.printStackTrace();
+ }
+
+ return(ret);
+ }
+
+ public Element getPart(String arg0) {
+ return null;
+ }
+
+ public void setHeaderPart(String arg0, Element arg1) {
+ }
+
+ public void setPart(String arg0, Element arg1) {
+ }
+
+ });
+ }
+
+}
Added: dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/ExampleWebServiceFactory.java
===================================================================
--- dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/ExampleWebServiceFactory.java (rev 0)
+++ dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/ExampleWebServiceFactory.java 2010-11-25 10:53:34 UTC (rev 1156)
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.example;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.soa.dsp.ServiceProvider;
+import org.jboss.soa.dsp.ws.SOAPMessageAdapter;
+import org.jboss.soa.dsp.ws.WSInvocationAdapter;
+import org.jboss.soa.dsp.ws.WebServiceProviderFactory;
+
+public class ExampleWebServiceFactory implements WebServiceProviderFactory {
+
+ public ServiceProvider getServiceProvider() {
+ return(new ExampleServiceProvider());
+ }
+
+ public WSInvocationAdapter getInvocationAdapter(String operationName,
+ QName serviceName, String portName, SOAPMessageAdapter soapAdapter) {
+ return(new WSInvocationAdapter(operationName,
+ serviceName, portName, soapAdapter));
+ }
+}
Added: dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/WSDeployer.java
===================================================================
--- dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/WSDeployer.java (rev 0)
+++ dsp/trunk/samples/deployer/src/main/java/org/jboss/soa/dsp/example/WSDeployer.java 2010-11-25 10:53:34 UTC (rev 1156)
@@ -0,0 +1,99 @@
+/*
+ * Copyright 2010 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.example;
+
+import java.io.File;
+import java.net.URL;
+import java.util.UUID;
+
+import javax.xml.namespace.QName;
+
+import org.jboss.soa.dsp.EndpointMetaData;
+import org.jboss.soa.dsp.ServiceEndpointReference;
+import org.jboss.soa.dsp.deployer.jboss.JBossServiceDeployer;
+import org.jboss.soa.dsp.server.ServerConfig;
+import org.jboss.soa.dsp.server.jboss.ServerConfigFactory;
+import org.jboss.soa.dsp.ws.BaseWebServiceEndpoint;
+import org.jboss.soa.dsp.ws.DeploymentBuilder;
+import org.jboss.soa.dsp.ws.WSDLParser;
+import org.jboss.soa.dsp.ws.WSDLReference;
+import org.jboss.soa.dsp.ws.WebServiceProviderGenerator;
+
+public class WSDeployer {
+
+ public WSDeployer() {
+ }
+
+ public ServiceEndpointReference deploy(java.io.File root, java.io.File wsdlFile) throws Exception {
+ ClassLoader cl=WSDeployer.class.getClassLoader();
+
+ javax.wsdl.factory.WSDLFactory factory=javax.wsdl.factory.WSDLFactory.newInstance();
+ javax.wsdl.Definition wsdl=factory.newWSDLReader().readWSDL(null, wsdlFile.getAbsolutePath());
+
+ WSDLReference wsdlRef=new WSDLReference(wsdl, wsdlFile.toURI());
+
+ WebServiceProviderGenerator providerFactory = new WebServiceProviderGenerator();
+
+ javax.wsdl.Service service=(javax.wsdl.Service)wsdl.getServices().values().iterator().next();
+
+ System.out.println("SERVICE="+service);
+
+ javax.wsdl.Port port=(javax.wsdl.Port)service.getPorts().values().iterator().next();
+
+ System.out.println("PORT="+port);
+
+ EndpointMetaData metaData=new EndpointMetaData(service.getQName(),
+ port.getName(), new QName("http://www.example.org", "ProcessId"),
+ UUID.randomUUID().toString());
+
+ BaseWebServiceEndpoint providerImpl =
+ providerFactory.createProvider(metaData, wsdlRef, cl,
+ null, ExampleWebServiceFactory.class);
+
+ System.out.println("PROVIDER="+providerImpl);
+
+ ServerConfig serverConfig=ServerConfigFactory.getServerConfig();
+
+ File warArchive = new DeploymentBuilder(serverConfig)
+ .setEndpoint(metaData.getEndpointId())
+ .setWSDL(wsdlFile, root)
+ .setProvider(providerImpl)
+ .build();
+
+ System.out.println("War Archive="+warArchive);
+
+ URL serviceUrl = new WSDLParser(wsdlRef.getDefinition()).getServiceLocationURL(metaData.getServiceName(),
+ metaData.getPortName());
+
+ System.out.println("Service URL="+serviceUrl);
+
+ JBossServiceDeployer deployer=new JBossServiceDeployer();
+
+ ServiceEndpointReference ref=deployer.deploy(metaData, providerImpl.getClass(),
+ serviceUrl, cl, warArchive);
+
+ System.out.println("DEPLOYED endpoint ref="+ref);
+
+ return(ref);
+ }
+
+ public void undeploy(ServiceEndpointReference ref) throws Exception {
+ JBossServiceDeployer deployer=new JBossServiceDeployer();
+
+ deployer.undeploy(ref);
+ }
+}
Added: dsp/trunk/samples/deployer/src/main/resources/META-INF/MANIFEST.MF
===================================================================
--- dsp/trunk/samples/deployer/src/main/resources/META-INF/MANIFEST.MF (rev 0)
+++ dsp/trunk/samples/deployer/src/main/resources/META-INF/MANIFEST.MF 2010-11-25 10:53:34 UTC (rev 1156)
@@ -0,0 +1,3 @@
+Manifest-Version: 1.0
+Class-Path:
+
Added: dsp/trunk/samples/deployer/src/main/resources/WEB-INF/lib/commons-fileupload-1.2.2.jar
===================================================================
(Binary files differ)
Property changes on: dsp/trunk/samples/deployer/src/main/resources/WEB-INF/lib/commons-fileupload-1.2.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: dsp/trunk/samples/deployer/src/main/resources/WEB-INF/lib/commons-io-1.3.2.jar
===================================================================
(Binary files differ)
Property changes on: dsp/trunk/samples/deployer/src/main/resources/WEB-INF/lib/commons-io-1.3.2.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: dsp/trunk/samples/deployer/src/main/resources/WEB-INF/lib/dsp-1.0.0-SNAPSHOT.jar
===================================================================
(Binary files differ)
Property changes on: dsp/trunk/samples/deployer/src/main/resources/WEB-INF/lib/dsp-1.0.0-SNAPSHOT.jar
___________________________________________________________________
Name: svn:mime-type
+ application/octet-stream
Added: dsp/trunk/samples/deployer/src/main/resources/WEB-INF/web.xml
===================================================================
--- dsp/trunk/samples/deployer/src/main/resources/WEB-INF/web.xml (rev 0)
+++ dsp/trunk/samples/deployer/src/main/resources/WEB-INF/web.xml 2010-11-25 10:53:34 UTC (rev 1156)
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="WebApp_ID" version="2.5">
+ <display-name>DSPExample</display-name>
+ <welcome-file-list>
+ <welcome-file>/upload.html</welcome-file>
+ </welcome-file-list>
+ <servlet>
+ <description></description>
+ <display-name>DeployServlet</display-name>
+ <servlet-name>DeployServlet</servlet-name>
+ <servlet-class>org.jboss.soa.dsp.example.DeployServlet</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>DeployServlet</servlet-name>
+ <url-pattern>/DeployServlet</url-pattern>
+ </servlet-mapping>
+</web-app>
\ No newline at end of file
Added: dsp/trunk/samples/deployer/src/main/resources/upload.html
===================================================================
--- dsp/trunk/samples/deployer/src/main/resources/upload.html (rev 0)
+++ dsp/trunk/samples/deployer/src/main/resources/upload.html 2010-11-25 10:53:34 UTC (rev 1156)
@@ -0,0 +1,10 @@
+<html>
+ <head></head>
+ <body>
+ <p>Commons File Upload Example</p>
+ <form action="DeployServlet" enctype="multipart/form-data" method="POST">
+ <input type="file" name="file1"><br>
+ <input type="Submit" value="Upload File"><br>
+ </form>
+ </body>
+</html>
\ No newline at end of file
14 years, 1 month
riftsaw SVN: r1155 - branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2010-11-24 23:39:27 -0500 (Wed, 24 Nov 2010)
New Revision: 1155
Modified:
branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/sybase.sql
Log:
* added null into sybase schema, as it requires this.
Modified: branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/sybase.sql
===================================================================
--- branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/sybase.sql 2010-11-25 03:08:34 UTC (rev 1154)
+++ branches/RiftSaw-2.1.x/runtime/engine-assembly/src/main/resources/bpel-sql/sybase.sql 2010-11-25 04:39:27 UTC (rev 1155)
@@ -2,21 +2,21 @@
insert into ODE_SCHEMA_VERSION values (6);
CREATE TABLE ODE_JOB (
- jobid CHAR(64) DEFAULT '' NOT NULL,
- ts BIGINT DEFAULT 0 NOT NULL,
- nodeid char(64),
- scheduled int DEFAULT 0 NOT NULL,
- transacted int DEFAULT 0 NOT NULL,
+ jobid CHAR(64) DEFAULT '' not null,
+ ts BIGINT DEFAULT 0 not null,
+ nodeid char(64) null,
+ scheduled int DEFAULT 0 not null,
+ transacted int DEFAULT 0 not null,
- instanceId BIGINT,
- mexId varchar(255),
- processId varchar(255),
- type varchar(255),
- channel varchar(255),
- correlatorId varchar(255),
- correlationKeySet varchar(255),
- retryCount int,
- inMem int,
+ instanceId BIGINT null,
+ mexId varchar(255) null,
+ processId varchar(255) null,
+ type varchar(255) null,
+ channel varchar(255) null,
+ correlatorId varchar(255) null,
+ correlationKeySet varchar(255) null,
+ retryCount int null,
+ inMem int null,
detailsExt IMAGE null,
PRIMARY KEY(jobid));
14 years, 1 month
riftsaw SVN: r1154 - in trunk: runtime/engine-assembly and 1 other directory.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2010-11-24 22:08:34 -0500 (Wed, 24 Nov 2010)
New Revision: 1154
Modified:
trunk/console/integration/pom.xml
trunk/runtime/engine-assembly/pom.xml
Log:
* update the si module to dsp sub-project.
Modified: trunk/console/integration/pom.xml
===================================================================
--- trunk/console/integration/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
+++ trunk/console/integration/pom.xml 2010-11-25 03:08:34 UTC (rev 1154)
@@ -59,12 +59,6 @@
</dependency>
<dependency>
- <groupId>org.jboss.soa</groupId>
- <artifactId>si</artifactId>
- <version>${riftsaw.engine.version}</version>
- </dependency>
-
- <dependency>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>riftsaw-bpel-store</artifactId>
</dependency>
@@ -81,6 +75,11 @@
<artifactId>riftsaw-utils</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-jboss</artifactId>
+ </dependency>
+
<!-- ODE 2.0 dependencies
<dependency>
<groupId>org.jboss.soa.bpel</groupId>
Modified: trunk/runtime/engine-assembly/pom.xml
===================================================================
--- trunk/runtime/engine-assembly/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
+++ trunk/runtime/engine-assembly/pom.xml 2010-11-25 03:08:34 UTC (rev 1154)
@@ -27,9 +27,8 @@
<version>${riftsaw.engine.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.soa</groupId>
- <artifactId>si</artifactId>
- <version>${riftsaw.engine.version}</version>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-jboss</artifactId>
</dependency>
<dependency>
<groupId>org.jboss.soa.bpel</groupId>
14 years, 1 month
riftsaw SVN: r1153 - in trunk: console and 22 other directories.
by riftsaw-commits@lists.jboss.org
Author: jeff.yuchang
Date: 2010-11-24 19:50:31 -0500 (Wed, 24 Nov 2010)
New Revision: 1153
Modified:
trunk/console/bpaf/pom.xml
trunk/console/bpel2svg/pom.xml
trunk/console/identity/pom.xml
trunk/console/integration/pom.xml
trunk/console/pom.xml
trunk/distribution/pom.xml
trunk/docs/docbook/gettingstartedguide/pom.xml
trunk/docs/docbook/gettingstartedguide/src/main/en-US/master.xml
trunk/docs/docbook/pom.xml
trunk/docs/docbook/userguide/pom.xml
trunk/docs/docbook/userguide/src/main/en-US/master.xml
trunk/integration-tests/pom.xml
trunk/pom.xml
trunk/qa/build.xml
trunk/qa/hudson-riftsaw-db.sh
trunk/qa/hudson-riftsaw-jboss-no-esb.sh
trunk/qa/hudson-riftsaw-jboss.sh
trunk/qa/hudson-riftsaw-local.sh
trunk/qa/hudson-riftsaw-soa-p.sh
trunk/qa/hudson-riftsaw-ws.sh
trunk/runtime/clustering/pom.xml
trunk/runtime/deployer/pom.xml
trunk/runtime/engine-assembly/pom.xml
trunk/runtime/engine/pom.xml
trunk/runtime/jbossesb-bpel-assembly/pom.xml
trunk/runtime/jbossesb-bpel/pom.xml
trunk/runtime/pom.xml
trunk/runtime/uddi/pom.xml
trunk/samples/esb/bpel_helloworld_saml/esbcontent/login-config.xml
trunk/stress-tests/pom.xml
Log:
* update version to 2.3.0-SNAPSHOT.
Modified: trunk/console/bpaf/pom.xml
===================================================================
--- trunk/console/bpaf/pom.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/console/bpaf/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>bpaf</artifactId>
<packaging>jar</packaging>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<name>RiftSaw::Console::BPAF</name>
<parent>
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>parent</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<!-- Properties -->
Modified: trunk/console/bpel2svg/pom.xml
===================================================================
--- trunk/console/bpel2svg/pom.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/console/bpel2svg/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -4,13 +4,13 @@
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>bpel2svg</artifactId>
<packaging>jar</packaging>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<name>RiftSaw::Console::BPEL2SVG</name>
<parent>
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>parent</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: trunk/console/identity/pom.xml
===================================================================
--- trunk/console/identity/pom.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/console/identity/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>identity</artifactId>
<packaging>jar</packaging>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<name>RiftSaw::Console::Identity</name>
<parent>
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>parent</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<build>
Modified: trunk/console/integration/pom.xml
===================================================================
--- trunk/console/integration/pom.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/console/integration/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>integration</artifactId>
<packaging>jar</packaging>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<name>RiftSaw::Console::Integration</name>
<parent>
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>parent</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<!-- Properties -->
Modified: trunk/console/pom.xml
===================================================================
--- trunk/console/pom.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/console/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -6,13 +6,13 @@
<groupId>org.jboss.soa.bpel.console</groupId>
<artifactId>parent</artifactId>
<packaging>pom</packaging>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<name>RiftSaw::Console</name>
<parent>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<modules>
Modified: trunk/distribution/pom.xml
===================================================================
--- trunk/distribution/pom.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/distribution/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -24,12 +24,12 @@
<artifactId>distribution</artifactId>
<packaging>pom</packaging>
<name>RiftSaw::Distribution</name>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<parent>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: trunk/docs/docbook/gettingstartedguide/pom.xml
===================================================================
--- trunk/docs/docbook/gettingstartedguide/pom.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/docs/docbook/gettingstartedguide/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -7,14 +7,14 @@
<groupId>org.jboss.soa.bpel.docs</groupId>
<artifactId>gettingstartedguide</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>RiftSaw::Docs::gettingstartedguide</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>docs</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
Modified: trunk/docs/docbook/gettingstartedguide/src/main/en-US/master.xml
===================================================================
--- trunk/docs/docbook/gettingstartedguide/src/main/en-US/master.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/docs/docbook/gettingstartedguide/src/main/en-US/master.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -5,7 +5,7 @@
<book lang="en">
<bookinfo>
- <title>RiftSaw 2.2.0-SNAPSHOT</title>
+ <title>RiftSaw 2.3.0-SNAPSHOT</title>
<subtitle>Getting Started Guide</subtitle>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/author_group.xml"/>
</bookinfo>
Modified: trunk/docs/docbook/pom.xml
===================================================================
--- trunk/docs/docbook/pom.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/docs/docbook/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -7,14 +7,14 @@
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>docs</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RiftSaw::Docs</name>
<parent>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<relativePath>../../pom.xml</relativePath>
</parent>
Modified: trunk/docs/docbook/userguide/pom.xml
===================================================================
--- trunk/docs/docbook/userguide/pom.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/docs/docbook/userguide/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -7,14 +7,14 @@
<groupId>org.jboss.soa.bpel.docs</groupId>
<artifactId>userguide</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<packaging>jdocbook</packaging>
<name>RiftSaw::Docs::userguide</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>docs</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
Modified: trunk/docs/docbook/userguide/src/main/en-US/master.xml
===================================================================
--- trunk/docs/docbook/userguide/src/main/en-US/master.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/docs/docbook/userguide/src/main/en-US/master.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -5,7 +5,7 @@
<book lang="en">
<bookinfo>
- <title>RiftSaw 2.2.0-SNAPSHOT</title>
+ <title>RiftSaw 2.3.0-SNAPSHOT</title>
<subtitle>User Guide</subtitle>
<xi:include xmlns:xi="http://www.w3.org/2001/XInclude" href="module/author_group.xml"/>
</bookinfo>
Modified: trunk/integration-tests/pom.xml
===================================================================
--- trunk/integration-tests/pom.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/integration-tests/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -5,12 +5,12 @@
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>integration-tests</artifactId>
<packaging>pom</packaging>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<name>RiftSaw::Integration-Tests</name>
<parent>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<properties>
<jboss.jbosssx.version>2.0.2.SP3</jboss.jbosssx.version>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -5,7 +5,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RiftSaw</name>
<url>http://www.jboss.org/riftsaw</url>
@@ -85,8 +85,8 @@
</profiles>
<properties>
- <riftsaw.ode.version>2.2.0-SNAPSHOT</riftsaw.ode.version>
- <riftsaw.engine.version>2.2.0-SNAPSHOT</riftsaw.engine.version>
+ <riftsaw.ode.version>2.3.0-SNAPSHOT</riftsaw.ode.version>
+ <riftsaw.engine.version>2.3.0-SNAPSHOT</riftsaw.engine.version>
<bpel.console.version>2.2.3-Final</bpel.console.version>
<activity.monitor.model.version>1.0.0-Beta2</activity.monitor.model.version>
<commons.logging.version>1.1.1</commons.logging.version>
Modified: trunk/qa/build.xml
===================================================================
--- trunk/qa/build.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/qa/build.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -9,7 +9,7 @@
<!-- CONFIGURABLE PROPERTIES -->
<property name="database" value="hsqldb" />
- <property name="riftsaw.version" value="2.2.0-SNAPSHOT" />
+ <property name="riftsaw.version" value="2.3.0-SNAPSHOT" />
<property name="riftsaw.home" value="${riftsaw.parent.dir}/riftsaw-${riftsaw.version}" /> <!-- riftsaw.home should not be configured. change riftsaw.parent.dir instead -->
<property name="jboss.parent.dir" value="${riftsaw.home}" />
Modified: trunk/qa/hudson-riftsaw-db.sh
===================================================================
--- trunk/qa/hudson-riftsaw-db.sh 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/qa/hudson-riftsaw-db.sh 2010-11-25 00:50:31 UTC (rev 1153)
@@ -8,7 +8,7 @@
DOWNLOAD_DIR="$RIFTSAW_PARENT_DIR/downloads"
JBOSS_VERSION="5.1.0.GA"
-RIFTSAW_VERSION="2.2.0-SNAPSHOT"
+RIFTSAW_VERSION="2.3.0-SNAPSHOT"
AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION"
AS_CONFIG="default"
REPLACE_QA_JDBC="true"
Modified: trunk/qa/hudson-riftsaw-jboss-no-esb.sh
===================================================================
--- trunk/qa/hudson-riftsaw-jboss-no-esb.sh 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/qa/hudson-riftsaw-jboss-no-esb.sh 2010-11-25 00:50:31 UTC (rev 1153)
@@ -8,7 +8,7 @@
DOWNLOAD_DIR="$RIFTSAW_PARENT_DIR/downloads"
JBOSS_VERSION="5.1.0.GA"
-RIFTSAW_VERSION="2.2.0-SNAPSHOT"
+RIFTSAW_VERSION="2.3.0-SNAPSHOT"
AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION"
AS_CONFIG="default"
REPLACE_QA_JDBC="true"
Modified: trunk/qa/hudson-riftsaw-jboss.sh
===================================================================
--- trunk/qa/hudson-riftsaw-jboss.sh 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/qa/hudson-riftsaw-jboss.sh 2010-11-25 00:50:31 UTC (rev 1153)
@@ -8,7 +8,7 @@
DOWNLOAD_DIR="$RIFTSAW_PARENT_DIR/downloads"
JBOSS_VERSION="5.1.0.GA"
-RIFTSAW_VERSION="2.2.0-SNAPSHOT"
+RIFTSAW_VERSION="2.3.0-SNAPSHOT"
AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION"
AS_CONFIG="default"
REPLACE_QA_JDBC="true"
Modified: trunk/qa/hudson-riftsaw-local.sh
===================================================================
--- trunk/qa/hudson-riftsaw-local.sh 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/qa/hudson-riftsaw-local.sh 2010-11-25 00:50:31 UTC (rev 1153)
@@ -8,7 +8,7 @@
DOWNLOAD_DIR="$RIFTSAW_PARENT_DIR/downloads"
JBOSS_VERSION="5.1.0.GA"
-RIFTSAW_VERSION="2.2.0-SNAPSHOT"
+RIFTSAW_VERSION="2.3.0-SNAPSHOT"
AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION"
AS_CONFIG="default"
REPLACE_QA_JDBC="true"
Modified: trunk/qa/hudson-riftsaw-soa-p.sh
===================================================================
--- trunk/qa/hudson-riftsaw-soa-p.sh 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/qa/hudson-riftsaw-soa-p.sh 2010-11-25 00:50:31 UTC (rev 1153)
@@ -10,7 +10,7 @@
DATABASE="hsql"
-RIFTSAW_VERSION="2.2.0-SNAPSHOT"
+RIFTSAW_VERSION="2.3.0-SNAPSHOT"
AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-soa-p.5.0.0/jboss-as"
AS_CONFIG="default"
REPLACE_QA_JDBC="true"
Modified: trunk/qa/hudson-riftsaw-ws.sh
===================================================================
--- trunk/qa/hudson-riftsaw-ws.sh 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/qa/hudson-riftsaw-ws.sh 2010-11-25 00:50:31 UTC (rev 1153)
@@ -9,7 +9,7 @@
JBOSS_VERSION="5.1.0.GA"
DATABASE="hsql"
-RIFTSAW_VERSION="2.2.0-SNAPSHOT"
+RIFTSAW_VERSION="2.3.0-SNAPSHOT"
AS_HOME="$RIFTSAW_PARENT_DIR/riftsaw-$RIFTSAW_VERSION/jboss-$JBOSS_VERSION"
AS_CONFIG="default"
WS_STACK_DIR="$RIFTSAW_PARENT_DIR/downloads"
Modified: trunk/runtime/clustering/pom.xml
===================================================================
--- trunk/runtime/clustering/pom.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/runtime/clustering/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.bpel.runtime</groupId>
<artifactId>riftsaw-clustering</artifactId>
<packaging>jar</packaging>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<name>RiftSaw::Runtime::Clustering</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<properties>
Modified: trunk/runtime/deployer/pom.xml
===================================================================
--- trunk/runtime/deployer/pom.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/runtime/deployer/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.bpel.runtime</groupId>
<artifactId>deployer</artifactId>
<packaging>jar</packaging>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<name>RiftSaw::Runtime::Deployer</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: trunk/runtime/engine/pom.xml
===================================================================
--- trunk/runtime/engine/pom.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/runtime/engine/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.bpel.runtime</groupId>
<artifactId>riftsaw-engine</artifactId>
<packaging>jar</packaging>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<name>RiftSaw::Runtime::Engine</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: trunk/runtime/engine-assembly/pom.xml
===================================================================
--- trunk/runtime/engine-assembly/pom.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/runtime/engine-assembly/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -4,14 +4,14 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.bpel.runtime</groupId>
<artifactId>riftsaw</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RiftSaw::Runtime::Engine-Assembly</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: trunk/runtime/jbossesb-bpel/pom.xml
===================================================================
--- trunk/runtime/jbossesb-bpel/pom.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/runtime/jbossesb-bpel/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.bpel.runtime</groupId>
<artifactId>jbossesb-bpel</artifactId>
<packaging>jar</packaging>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<name>RiftSaw::Runtime::JBossESB-BPEL</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: trunk/runtime/jbossesb-bpel-assembly/pom.xml
===================================================================
--- trunk/runtime/jbossesb-bpel-assembly/pom.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/runtime/jbossesb-bpel-assembly/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -4,13 +4,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa.bpel.runtime</groupId>
<artifactId>bpel.esb</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>RiftSaw::Runtime::JBossESB-BPEL-Assembly</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: trunk/runtime/pom.xml
===================================================================
--- trunk/runtime/pom.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/runtime/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -6,13 +6,13 @@
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
<packaging>pom</packaging>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<name>RiftSaw::Runtime</name>
<parent>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<modules>
Modified: trunk/runtime/uddi/pom.xml
===================================================================
--- trunk/runtime/uddi/pom.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/runtime/uddi/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -5,13 +5,13 @@
<groupId>org.jboss.soa.bpel.runtime</groupId>
<artifactId>riftsaw-uddi</artifactId>
<packaging>jar</packaging>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<name>RiftSaw::Runtime::UDDI</name>
<parent>
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>runtime</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<dependencies>
Modified: trunk/samples/esb/bpel_helloworld_saml/esbcontent/login-config.xml
===================================================================
--- trunk/samples/esb/bpel_helloworld_saml/esbcontent/login-config.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/samples/esb/bpel_helloworld_saml/esbcontent/login-config.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -2,12 +2,12 @@
<application-policy name="saml-issue-token">
<authentication>
<login-module code="org.picketlink.identity.federation.core.wstrust.auth.STSIssuingLoginModule" flag="required">
- <module-option name="configFile">/Users/jdelong/Riftsaw22/riftsaw-2.2.0-SNAPSHOT/samples/esb/bpel_helloworld_saml/esbcontent/sts-client.properties</module-option>
+ <module-option name="configFile">/Users/jdelong/Riftsaw22/riftsaw-2.3.0-SNAPSHOT/samples/esb/bpel_helloworld_saml/esbcontent/sts-client.properties</module-option>
<module-option name="endpointURI">http://security_saml/goodbyeworld</module-option>
<module-option name="password-stacking">true</module-option>
</login-module>
<login-module code="org.picketlink.identity.federation.core.wstrust.auth.STSValidatingLoginModule" flag="required">
- <module-option name="configFile">/Users/jdelong/Riftsaw22/riftsaw-2.2.0-SNAPSHOT/samples/esb/bpel_helloworld_saml/esbcontent/sts-client.properties</module-option>
+ <module-option name="configFile">/Users/jdelong/Riftsaw22/riftsaw-2.3.0-SNAPSHOT/samples/esb/bpel_helloworld_saml/esbcontent/sts-client.properties</module-option>
<module-option name="password-stacking">useFirstPass</module-option>
</login-module>
</authentication>
@@ -16,7 +16,7 @@
<application-policy name="saml-validate-token">
<authentication>
<login-module code="org.picketlink.identity.federation.core.wstrust.auth.STSValidatingLoginModule" flag="required">
- <module-option name="configFile">/Users/jdelong/Riftsaw22/riftsaw-2.2.0-SNAPSHOT/samples/esb/bpel_helloworld_saml/esbcontent/sts-client.properties</module-option>
+ <module-option name="configFile">/Users/jdelong/Riftsaw22/riftsaw-2.3.0-SNAPSHOT/samples/esb/bpel_helloworld_saml/esbcontent/sts-client.properties</module-option>
<module-option name="useOptionsCredentials">true</module-option>
</login-module>
</authentication>
Modified: trunk/stress-tests/pom.xml
===================================================================
--- trunk/stress-tests/pom.xml 2010-11-24 18:47:20 UTC (rev 1152)
+++ trunk/stress-tests/pom.xml 2010-11-25 00:50:31 UTC (rev 1153)
@@ -5,12 +5,12 @@
<groupId>org.jboss.soa.bpel</groupId>
<artifactId>stress-tests</artifactId>
<packaging>jar</packaging>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
<name>RiftSaw::Stress-Tests</name>
<parent>
<groupId>org.jboss.soa</groupId>
<artifactId>bpel</artifactId>
- <version>2.2.0-SNAPSHOT</version>
+ <version>2.3.0-SNAPSHOT</version>
</parent>
<profiles>
14 years, 1 month
riftsaw SVN: r1152 - dsp/trunk/jboss.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2010-11-24 13:47:20 -0500 (Wed, 24 Nov 2010)
New Revision: 1152
Modified:
dsp/trunk/jboss/
Log:
Property changes on: dsp/trunk/jboss
___________________________________________________________________
Name: svn:ignore
+ .settings
target
.classpath
.project
14 years, 1 month
riftsaw SVN: r1151 - in dsp/trunk: api and 17 other directories.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2010-11-24 13:43:49 -0500 (Wed, 24 Nov 2010)
New Revision: 1151
Added:
dsp/trunk/api/pom.xml
dsp/trunk/jboss/
dsp/trunk/jboss/pom.xml
dsp/trunk/jboss/src/
dsp/trunk/jboss/src/main/
dsp/trunk/jboss/src/main/java/
dsp/trunk/jboss/src/main/java/org/
dsp/trunk/jboss/src/main/java/org/jboss/
dsp/trunk/jboss/src/main/java/org/jboss/soa/
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/deployer/
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/deployer/jboss/
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/deployer/jboss/JBossServiceDeployer.java
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/deployer/jboss/WebMetaDataFactory.java
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/KernelAwareSPIFactory.java
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/KernelLocator.java
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/MBeanServerLocator.java
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/ObjectNameFactory.java
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/ServerConfigFactory.java
dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/ServerConfigImpl.java
dsp/trunk/jboss/src/main/resources/
dsp/trunk/jboss/src/main/resources/META-INF/
dsp/trunk/jboss/src/main/resources/META-INF/jboss-beans.xml
dsp/trunk/jboss/src/test/
dsp/trunk/jboss/src/test/java/
dsp/trunk/jboss/src/test/resources/
Removed:
dsp/trunk/api/src/main/java/org/jboss/soa/dsp/deployer/jboss/
dsp/trunk/api/src/main/java/org/jboss/soa/dsp/server/jboss/
Modified:
dsp/trunk/api/
dsp/trunk/pom.xml
Log:
Restructured to separate into api and platform specific (jboss initially) modules.
Property changes on: dsp/trunk/api
___________________________________________________________________
Name: svn:ignore
+ .settings
target
.classpath
.project
Added: dsp/trunk/api/pom.xml
===================================================================
--- dsp/trunk/api/pom.xml (rev 0)
+++ dsp/trunk/api/pom.xml 2010-11-24 18:43:49 UTC (rev 1151)
@@ -0,0 +1,40 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-api</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>SOA::DSP::API</name>
+
+ <parent>
+ <groupId>org.jboss.soa</groupId>
+ <artifactId>dsp</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>${jaxws.version}</version>
+ </dependency>
+ </dependencies>
+
+</project>
Added: dsp/trunk/jboss/pom.xml
===================================================================
--- dsp/trunk/jboss/pom.xml (rev 0)
+++ dsp/trunk/jboss/pom.xml 2010-11-24 18:43:49 UTC (rev 1151)
@@ -0,0 +1,82 @@
+<?xml version="1.0"?>
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+ <modelVersion>4.0.0</modelVersion>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-jboss</artifactId>
+ <packaging>jar</packaging>
+ <version>1.0.0-SNAPSHOT</version>
+ <name>SOA::DSP::JBoss</name>
+
+ <parent>
+ <groupId>org.jboss.soa</groupId>
+ <artifactId>dsp</artifactId>
+ <version>1.0.0-SNAPSHOT</version>
+ </parent>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-api</artifactId>
+ <version>${dsp.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <version>${wsdl4j.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ <version>${commons.logging.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javassist</groupId>
+ <artifactId>javassist</artifactId>
+ <version>${javassist.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
+ <version>${jaxws.version}</version>
+ </dependency>
+
+ <!-- Dependencies for JBoss specific deployer -->
+ <dependency>
+ <groupId>org.jboss.metadata</groupId>
+ <artifactId>jboss-metadata</artifactId>
+ <version>${jboss.metadata.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <version>${jboss.microcontainer.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <version>${jboss.microcontainer.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-client-spi</artifactId>
+ <version>${jboss.deployers.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-core-spi</artifactId>
+ <version>${jboss.deployers.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-structure-spi</artifactId>
+ <version>${jboss.deployers.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.deployers</groupId>
+ <artifactId>jboss-deployers-vfs-spi</artifactId>
+ <version>${jboss.deployers.version}</version>
+ </dependency>
+
+ </dependencies>
+</project>
Added: dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/deployer/jboss/JBossServiceDeployer.java
===================================================================
--- dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/deployer/jboss/JBossServiceDeployer.java (rev 0)
+++ dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/deployer/jboss/JBossServiceDeployer.java 2010-11-24 18:43:49 UTC (rev 1151)
@@ -0,0 +1,128 @@
+/*
+ * Copyright 2010 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.deployer.jboss;
+
+import java.io.File;
+import java.io.IOException;
+import java.net.URL;
+
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.deployers.client.spi.DeployerClient;
+import org.jboss.deployers.client.spi.Deployment;
+import org.jboss.deployers.spi.attachments.MutableAttachments;
+import org.jboss.deployers.structure.spi.ClassLoaderFactory;
+import org.jboss.deployers.structure.spi.DeploymentUnit;
+import org.jboss.deployers.structure.spi.DeploymentUnitFilter;
+import org.jboss.deployers.vfs.spi.client.VFSDeploymentFactory;
+import org.jboss.kernel.Kernel;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.soa.dsp.EndpointMetaData;
+import org.jboss.soa.dsp.ServiceEndpointReference;
+import org.jboss.soa.dsp.deployer.ServiceDeployer;
+import org.jboss.soa.dsp.server.jboss.KernelLocator;
+import org.jboss.virtual.VFS;
+import org.jboss.virtual.VirtualFile;
+
+public class JBossServiceDeployer implements ServiceDeployer {
+
+ public ServiceEndpointReference deploy(EndpointMetaData metaData, Class<?> providerImpl, URL serviceUrl,
+ final ClassLoader classLoader, File warArchive) throws Exception {
+ Deployment deployment = createVFSDeployment(warArchive);
+
+ // Classloading
+ ClassLoaderFactory clf = new DelegatingClassLoaderFactory(classLoader);
+
+ // WebMetaData
+ String[] webContext = deriveWebContextFromServiceUrl(serviceUrl);
+
+ WebMetaDataFactory wmdFactory = new WebMetaDataFactory(
+ metaData.getEndpointId(), webContext[0], webContext[1], providerImpl.getName()
+ );
+
+ MutableAttachments mutableAttachments =
+ (MutableAttachments)deployment.getPredeterminedManagedObjects();
+
+ // Applies to in memory only. Not used with VFS underneath
+ //mutableAttachments.addAttachment(StructureMetaData.class, new StructureMetaDataImpl());
+ mutableAttachments.addAttachment(ClassLoaderFactory.class, clf);
+ mutableAttachments.addAttachment(JBossWebMetaData.class, wmdFactory.createWebMetaData(classLoader));
+ mutableAttachments.addAttachment(DeploymentUnitFilter.class, new RiftsawWSDeploymentUnitFilter());
+
+ getMainDeployer().deploy(deployment);
+
+ ServiceEndpointReference ref = new ServiceEndpointReference(
+ metaData.getEndpointId(), serviceUrl, deployment.getName(), warArchive.getAbsolutePath()
+ );
+
+ //ref.setArchiveLocation(warArchive.getAbsolutePath());
+
+ return(ref);
+ }
+
+ public void undeploy(ServiceEndpointReference ref) throws Exception {
+ getMainDeployer().undeploy(ref.getDeploymentName());
+ }
+
+ private String[] deriveWebContextFromServiceUrl(URL serviceUrl) {
+ // metadata based on soapAddress
+ String urlPathInfo = serviceUrl.getPath(); // has always leading slash
+ urlPathInfo = urlPathInfo.substring(1, urlPathInfo.length());
+
+ String actualWebContext;
+ String actualUrlPattern;
+ actualWebContext = urlPathInfo;
+ actualUrlPattern = "/*";
+
+ return new String[] {actualWebContext, actualUrlPattern};
+ }
+
+ private Deployment createVFSDeployment(File war) throws IOException {
+ VirtualFile webAppVFS = VFS.getRoot(war.toURI().toURL());
+ return VFSDeploymentFactory.getInstance().createVFSDeployment(webAppVFS);
+ }
+
+ private DeployerClient getMainDeployer() {
+ Kernel mc = KernelLocator.getKernel();
+ ControllerContext context = mc.getController().getInstalledContext("MainDeployer");
+ DeployerClient mainDeployer = (DeployerClient)context.getTarget();
+ return mainDeployer;
+ }
+
+ public class DelegatingClassLoaderFactory implements ClassLoaderFactory {
+ private ClassLoader delegate;
+
+ public DelegatingClassLoaderFactory(final ClassLoader delegate) {
+ this.delegate = delegate;
+ }
+
+ public ClassLoader createClassLoader(DeploymentUnit unit) throws Exception {
+ return delegate;
+ }
+
+ public void removeClassLoader(DeploymentUnit unit) throws Exception {
+ // cleanup?
+ }
+ }
+
+ public class RiftsawWSDeploymentUnitFilter implements DeploymentUnitFilter {
+ public boolean accepts(DeploymentUnit unit) {
+ // When I am attached, it's always a BPEL deployment
+ return false;
+ }
+ }
+
+}
Added: dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/deployer/jboss/WebMetaDataFactory.java
===================================================================
--- dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/deployer/jboss/WebMetaDataFactory.java (rev 0)
+++ dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/deployer/jboss/WebMetaDataFactory.java 2010-11-24 18:43:49 UTC (rev 1151)
@@ -0,0 +1,104 @@
+/*
+ * Copyright 2010 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.deployer.jboss;
+
+import org.jboss.metadata.web.jboss.JBossServletMetaData;
+import org.jboss.metadata.web.jboss.JBossServletsMetaData;
+import org.jboss.metadata.web.jboss.JBossWebMetaData;
+import org.jboss.metadata.web.spec.ServletMappingMetaData;
+
+import java.util.ArrayList;
+import java.util.List;
+
+/**
+ * Creates an in-memory representation of web meta data.
+ * Based on http://anonsvn.jboss.org/repos/jbossas/tags/JBoss_5_1_0_GA/webservices/sr...
+ *
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class WebMetaDataFactory
+{
+ private String endpointId;
+ private String servletClassName = null;
+ private String webContext = null;
+ private String urlPattern = null;
+
+ public WebMetaDataFactory(String endpointId, String webContext, String urlPattern, String servletClassName)
+ {
+ this.endpointId = endpointId;
+ this.servletClassName = servletClassName;
+ this.webContext = webContext;
+ this.urlPattern = urlPattern;
+ }
+
+ public JBossWebMetaData createWebMetaData(ClassLoader loader)
+ {
+ JBossWebMetaData jbwmd = new JBossWebMetaData();
+ createWebAppDescriptor(jbwmd);
+ createJBossWebAppDescriptor(jbwmd);
+ return jbwmd;
+ }
+
+ private void createWebAppDescriptor(JBossWebMetaData jbwmd)
+ {
+ /*
+ <servlet>
+ <servlet-name>
+ <servlet-class>
+ </servlet>
+ */
+ JBossServletsMetaData servlets = jbwmd.getServlets();
+ JBossServletMetaData servlet = new JBossServletMetaData();
+ servlet.setServletName("Endpoint-"+endpointId);
+ servlet.setServletClass(servletClassName);
+ servlets.add(servlet);
+
+
+ /*
+ <servlet-mapping>
+ <servlet-name>
+ <url-pattern>
+ </servlet-mapping>
+ */
+ List<ServletMappingMetaData> servletMappings = jbwmd.getServletMappings();
+ if (servletMappings == null)
+ {
+ servletMappings = new ArrayList<ServletMappingMetaData>();
+ jbwmd.setServletMappings(servletMappings);
+ }
+ ServletMappingMetaData servletMapping = new ServletMappingMetaData();
+ servletMapping.setServletName("Endpoint-"+endpointId);
+ ArrayList<String> urlPatterns = new ArrayList<String>();
+ urlPatterns.add(urlPattern);
+ servletMapping.setUrlPatterns(urlPatterns);
+ servletMappings.add(servletMapping);
+
+ }
+
+ private void createJBossWebAppDescriptor(JBossWebMetaData jbwmd)
+ {
+ /* Create a jboss-web
+ <jboss-web>
+ <security-domain>java:/jaas/cts</security-domain>
+ <context-root>/ws/ejbN/</context-root>
+ <virtual-host>some.domain.com</virtual-host>
+ </jboss-web>
+ */
+
+ jbwmd.setContextRoot(webContext);
+ }
+}
Added: dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/KernelAwareSPIFactory.java
===================================================================
--- dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/KernelAwareSPIFactory.java (rev 0)
+++ dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/KernelAwareSPIFactory.java 2010-11-24 18:43:49 UTC (rev 1151)
@@ -0,0 +1,37 @@
+/*
+ * Copyright 2010 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.server.jboss;
+
+import org.jboss.dependency.spi.ControllerContext;
+import org.jboss.kernel.spi.dependency.KernelController;
+
+/**
+ * SPI factory delegating to kernel for bean lookups
+ *
+ * @author richard.opalka(a)jboss.com
+ * @author Heiko.Braun(a)jboss.com
+ */
+public class KernelAwareSPIFactory
+{
+ @SuppressWarnings("unchecked")
+ public <T> T getKernelProvidedSPI(String beanName, Class<T> spiArtifact)
+ {
+ KernelController controller = KernelLocator.getKernel().getController();
+ ControllerContext ctx = controller.getInstalledContext(beanName);
+ return (T)ctx.getTarget();
+ }
+}
\ No newline at end of file
Added: dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/KernelLocator.java
===================================================================
--- dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/KernelLocator.java (rev 0)
+++ dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/KernelLocator.java 2010-11-24 18:43:49 UTC (rev 1151)
@@ -0,0 +1,42 @@
+/*
+ * Copyright 2010 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.server.jboss;
+
+//$Id$
+
+import org.jboss.kernel.Kernel;
+
+/**
+ * Locate the single instance of the kernel
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 12-May-2006
+ */
+public class KernelLocator
+{
+ private static Kernel kernel;
+
+ public static Kernel getKernel()
+ {
+ return KernelLocator.kernel;
+ }
+
+ public void setKernel(Kernel kernel)
+ {
+ KernelLocator.kernel = kernel;
+ }
+}
Added: dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/MBeanServerLocator.java
===================================================================
--- dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/MBeanServerLocator.java (rev 0)
+++ dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/MBeanServerLocator.java 2010-11-24 18:43:49 UTC (rev 1151)
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2010 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.server.jboss;
+
+import javax.management.MBeanServer;
+import javax.management.MBeanServerFactory;
+import java.util.Iterator;
+
+/**
+ * Locate the single instance of the MBeanServer
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 30-Jul-2007
+ */
+public class MBeanServerLocator
+{
+ private MBeanServer mbeanServer;
+
+ public MBeanServer getMbeanServer()
+ {
+ // In jboss-4.2 the MBeanServer cannot be injected
+ if (mbeanServer == null)
+ {
+ for (Iterator i = MBeanServerFactory.findMBeanServer(null).iterator(); i.hasNext();)
+ {
+ mbeanServer = (MBeanServer)i.next();
+ break;
+ }
+ }
+ return mbeanServer;
+ }
+
+ public void setMbeanServer(MBeanServer mbeanServer)
+ {
+ this.mbeanServer = mbeanServer;
+ }
+}
Added: dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/ObjectNameFactory.java
===================================================================
--- dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/ObjectNameFactory.java (rev 0)
+++ dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/ObjectNameFactory.java 2010-11-24 18:43:49 UTC (rev 1151)
@@ -0,0 +1,66 @@
+/*
+ * Copyright 2010 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.server.jboss;
+
+import javax.management.MalformedObjectNameException;
+import javax.management.ObjectName;
+import java.util.Hashtable;
+
+/**
+ * A simple factory for creating safe object names.
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @since 08-May-2006
+ */
+public class ObjectNameFactory
+{
+ public static ObjectName create(String name)
+ {
+ try
+ {
+ return new ObjectName(name);
+ }
+ catch (MalformedObjectNameException e)
+ {
+ throw new Error("Invalid ObjectName: " + name + "; " + e);
+ }
+ }
+
+ public static ObjectName create(String domain, String key, String value)
+ {
+ try
+ {
+ return new ObjectName(domain, key, value);
+ }
+ catch (MalformedObjectNameException e)
+ {
+ throw new Error("Invalid ObjectName: " + domain + "," + key + "," + value + "; " + e);
+ }
+ }
+
+ public static ObjectName create(String domain, Hashtable table)
+ {
+ try
+ {
+ return new ObjectName(domain, table);
+ }
+ catch (MalformedObjectNameException e)
+ {
+ throw new Error("Invalid ObjectName: " + domain + "," + table + "; " + e);
+ }
+ }
+}
Added: dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/ServerConfigFactory.java
===================================================================
--- dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/ServerConfigFactory.java (rev 0)
+++ dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/ServerConfigFactory.java 2010-11-24 18:43:49 UTC (rev 1151)
@@ -0,0 +1,41 @@
+/*
+ * Copyright 2010 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.server.jboss;
+
+import org.jboss.soa.dsp.server.ServerConfig;
+
+
+/**
+ * Factory to container independent config
+ *
+ * @author Thomas.Diesler(a)jboss.org
+ * @author Heiko.Braun(a)jboss.com
+ *
+ * @since 08-May-2006
+ */
+public class ServerConfigFactory
+{
+ /** The default bean name */
+ public static String BEAN_NAME = "org.jboss.soa.dsp:service=ServerConfig";
+
+ public static ServerConfig getServerConfig()
+ {
+ return new KernelAwareSPIFactory().getKernelProvidedSPI(
+ BEAN_NAME, ServerConfig.class
+ );
+ }
+}
\ No newline at end of file
Added: dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/ServerConfigImpl.java
===================================================================
--- dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/ServerConfigImpl.java (rev 0)
+++ dsp/trunk/jboss/src/main/java/org/jboss/soa/dsp/server/jboss/ServerConfigImpl.java 2010-11-24 18:43:49 UTC (rev 1151)
@@ -0,0 +1,247 @@
+/*
+ * Copyright 2010 Red Hat, Inc
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ *
+ */
+package org.jboss.soa.dsp.server.jboss;
+
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.jboss.soa.dsp.server.ServerConfig;
+import org.jboss.util.id.GUID;
+
+import javax.management.AttributeNotFoundException;
+import javax.management.JMException;
+import javax.management.MBeanServer;
+import javax.management.ObjectName;
+import java.io.File;
+import java.net.InetAddress;
+import java.net.UnknownHostException;
+import java.util.Set;
+
+/**
+ * @author Heiko.Braun <heiko.braun(a)jboss.com>
+ */
+public class ServerConfigImpl implements ServerConfig
+{
+ protected final Log log = LogFactory.getLog(getClass());
+
+ // The MBeanServer
+ private MBeanServer mbeanServer;
+
+ private final static String UNDEFINED_HOSTNAME = "undefined.host";
+
+ // The webservice host name that will be used when updating the wsdl
+ private String webServiceHost = UNDEFINED_HOSTNAME;
+ // The webservice port that will be used when updating the wsdl
+ private int webServicePort;
+ // The webservice port that will be used when updating the wsdl
+ private int webServiceSecurePort;
+
+ private static String nonClusteredServerName=new GUID().toString();
+
+ private String clusterNodeName;
+
+ public ServerConfigImpl()
+ {
+ }
+
+ public MBeanServer getMbeanServer()
+ {
+ return mbeanServer;
+ }
+
+ public void setMbeanServer(MBeanServer mbeanServer)
+ {
+ this.mbeanServer = mbeanServer;
+ }
+
+ public String getImplementationTitle()
+ {
+ return "jbossas-riftsaw";
+ }
+
+ public String getImplementationVersion()
+ {
+ return "5.x";
+ }
+
+ public File getServerTempDir()
+ {
+ try
+ {
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ File dir = (File)getMbeanServer().getAttribute(oname, "ServerTempDir");
+ return dir;
+ }
+ catch (JMException e)
+ {
+ return null;
+ }
+ }
+
+ public File getHomeDir()
+ {
+ try
+ {
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ File dir = (File)getMbeanServer().getAttribute(oname, "HomeDir");
+ return dir;
+ }
+ catch (JMException e)
+ {
+ return null;
+ }
+ }
+
+ public File getServerDataDir()
+ {
+ try
+ {
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ File dir = (File)getMbeanServer().getAttribute(oname, "ServerDataDir");
+ return dir;
+ }
+ catch (JMException e)
+ {
+ return null;
+ }
+ }
+
+ public String getWebServiceHost()
+ {
+ return webServiceHost;
+ }
+
+ public void setWebServiceHost(String host) throws UnknownHostException
+ {
+ if (host == null || host.trim().length() == 0)
+ {
+ log.debug("Using undefined host: " + UNDEFINED_HOSTNAME);
+ host = UNDEFINED_HOSTNAME;
+ }
+ if ("0.0.0.0".equals(host))
+ {
+ InetAddress localHost = InetAddress.getLocalHost();
+ log.debug("Using local host: " + localHost.getHostName());
+ host = localHost.getHostName();
+ }
+ this.webServiceHost = host;
+ }
+
+ public void setWebServicePort(int port)
+ {
+ this.webServicePort = port;
+ }
+
+ public void setWebServiceSecurePort(int port)
+ {
+ this.webServiceSecurePort = port;
+ }
+
+ public int getWebServicePort()
+ {
+ if (webServicePort <= 0)
+ webServicePort = getConnectorPort("HTTP/1.1", false);
+
+ int localPort = webServicePort;
+ if (localPort <= 0)
+ {
+ // Do not initialize webServicePort with the default, the connector port may become available later
+ log.warn("Unable to calculate 'WebServicePort', using default '8080'");
+ localPort = 8080;
+ }
+
+ return localPort;
+ }
+
+
+ public int getWebServiceSecurePort()
+ {
+ if (webServiceSecurePort <= 0)
+ webServiceSecurePort = getConnectorPort("HTTP/1.1", true);
+
+ int localPort = webServiceSecurePort;
+ if (localPort <= 0)
+ {
+ // Do not initialize webServiceSecurePort with the default, the connector port may become available later
+ log.warn("Unable to calculate 'WebServiceSecurePort', using default '8443'");
+ localPort = 8443;
+ }
+
+ return localPort;
+ }
+
+ private int getConnectorPort(final String protocol, final boolean secure)
+ {
+ int port = -1;
+
+ try
+ {
+ ObjectName connectors = new ObjectName("jboss.web:type=Connector,*");
+
+ Set connectorNames = getMbeanServer().queryNames(connectors, null);
+ for (Object current : connectorNames)
+ {
+ ObjectName currentName = (ObjectName)current;
+
+ try
+ {
+ int connectorPort = (Integer)getMbeanServer().getAttribute(currentName, "port");
+ boolean connectorSecure = (Boolean)getMbeanServer().getAttribute(currentName, "secure");
+ String connectorProtocol = (String)getMbeanServer().getAttribute(currentName, "protocol");
+
+
+ if (protocol.equals(connectorProtocol) && secure == connectorSecure)
+ {
+ if (port > -1)
+ {
+ log.warn("Found multiple connectors for protocol='" + protocol + "' and secure='" + secure + "', using first port found '" + port + "'");
+ }
+ else
+ {
+ port = connectorPort;
+ }
+ }
+ }
+ catch (AttributeNotFoundException ignored)
+ {
+ }
+ }
+
+ return port;
+ }
+ catch (JMException e)
+ {
+ return -1;
+ }
+ }
+
+ public String getClusterNodeName() {
+ if (this.clusterNodeName == null || "".equals(this.clusterNodeName.trim())) {
+ return nonClusteredServerName;
+ }
+ return this.clusterNodeName;
+ }
+
+ public void setClusterNodeName(String clusterNodeName) {
+ this.clusterNodeName = clusterNodeName;
+ }
+
+
+ public String getUddiNodeName() {
+ return this.getWebServiceHost() + "-" + this.getWebServicePort();
+ }
+
+}
Added: dsp/trunk/jboss/src/main/resources/META-INF/jboss-beans.xml
===================================================================
--- dsp/trunk/jboss/src/main/resources/META-INF/jboss-beans.xml (rev 0)
+++ dsp/trunk/jboss/src/main/resources/META-INF/jboss-beans.xml 2010-11-24 18:43:49 UTC (rev 1151)
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+ <!--
+ Locate the single instance of the kernel
+ -->
+ <bean name="org.jboss.soa.dsp:service=KernelLocator"
+ class="org.jboss.soa.dsp.server.jboss.KernelLocator">
+ <property name="kernel">
+ <inject bean="jboss.kernel:service=Kernel" />
+ </property>
+ </bean>
+
+ <!--
+ ServerConfig
+ -->
+ <bean name="org.jboss.soa.dsp:service=ServerConfig"
+ class="org.jboss.soa.dsp.server.jboss.ServerConfigImpl">
+ <property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
+ <property name="webServiceHost">${jboss.bind.address}</property>
+ </bean>
+
+
+</deployment>
Modified: dsp/trunk/pom.xml
===================================================================
--- dsp/trunk/pom.xml 2010-11-24 18:35:12 UTC (rev 1150)
+++ dsp/trunk/pom.xml 2010-11-24 18:43:49 UTC (rev 1151)
@@ -4,11 +4,12 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.soa</groupId>
<artifactId>dsp</artifactId>
- <packaging>jar</packaging>
+ <packaging>pom</packaging>
<version>1.0.0-SNAPSHOT</version>
<name>SOA::DSP</name>
<properties>
+ <dsp.version>1.0.0-SNAPSHOT</dsp.version>
<junit.version>4.8.1</junit.version>
<jboss.version>5.1.0.GA</jboss.version>
<jaxws.version>2.1</jaxws.version>
@@ -20,81 +21,12 @@
<jboss.deployers.version>2.0.7.GA</jboss.deployers.version>
</properties>
- <dependencies>
- <dependency>
- <groupId>wsdl4j</groupId>
- <artifactId>wsdl4j</artifactId>
- <version>${wsdl4j.version}</version>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- <version>${commons.logging.version}</version>
- </dependency>
- <dependency>
- <groupId>javassist</groupId>
- <artifactId>javassist</artifactId>
- <version>${javassist.version}</version>
- </dependency>
- <dependency>
- <groupId>javax.xml.ws</groupId>
- <artifactId>jaxws-api</artifactId>
- <version>${jaxws.version}</version>
- </dependency>
-
- <!-- Dependencies for JBoss specific deployer -->
- <dependency>
- <groupId>org.jboss.metadata</groupId>
- <artifactId>jboss-metadata</artifactId>
- <version>${jboss.metadata.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
- <version>${jboss.microcontainer.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-dependency</artifactId>
- <version>${jboss.microcontainer.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-client-spi</artifactId>
- <version>${jboss.deployers.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-core-spi</artifactId>
- <version>${jboss.deployers.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-structure-spi</artifactId>
- <version>${jboss.deployers.version}</version>
- </dependency>
- <dependency>
- <groupId>org.jboss.deployers</groupId>
- <artifactId>jboss-deployers-vfs-spi</artifactId>
- <version>${jboss.deployers.version}</version>
- </dependency>
+ <modules>
+ <module>api</module>
+ <module>jboss</module>
+ </modules>
- </dependencies>
-
- <distributionManagement>
- <repository>
- <id>jboss-releases-repository</id>
- <name>JBoss Releases Repository</name>
- <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
- </repository>
- <snapshotRepository>
- <id>jboss-snapshots-repository</id>
- <name>JBoss Snapshots Repository</name>
- <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
- </snapshotRepository>
- </distributionManagement>
-
<build>
<!-- This section defines the default plugin settings inherited by child projects. -->
<pluginManagement>
@@ -161,6 +93,19 @@
</plugins>
</build>
+ <distributionManagement>
+ <repository>
+ <id>jboss-releases-repository</id>
+ <name>JBoss Releases Repository</name>
+ <url>https://repository.jboss.org/nexus/service/local/staging/deploy/maven2/</url>
+ </repository>
+ <snapshotRepository>
+ <id>jboss-snapshots-repository</id>
+ <name>JBoss Snapshots Repository</name>
+ <url>https://repository.jboss.org/nexus/content/repositories/snapshots/</url>
+ </snapshotRepository>
+ </distributionManagement>
+
<reporting>
<plugins>
<plugin>
14 years, 1 month
riftsaw SVN: r1150 - in trunk: distribution/src/main/release/db/jboss and 6 other directories.
by riftsaw-commits@lists.jboss.org
Author: objectiser
Date: 2010-11-24 13:35:12 -0500 (Wed, 24 Nov 2010)
New Revision: 1150
Modified:
trunk/distribution/src/main/release/db/jboss/jboss-beans.xml
trunk/pom.xml
trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml
trunk/runtime/engine-assembly/src/main/assembly/sar.xml
trunk/runtime/engine/pom.xml
trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml
trunk/runtime/jbossesb-bpel/pom.xml
trunk/runtime/uddi/pom.xml
Log:
Updated to use the new separate api and jboss modules for dsp.
Modified: trunk/distribution/src/main/release/db/jboss/jboss-beans.xml
===================================================================
--- trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2010-11-24 16:39:43 UTC (rev 1149)
+++ trunk/distribution/src/main/release/db/jboss/jboss-beans.xml 2010-11-24 18:35:12 UTC (rev 1150)
@@ -23,7 +23,7 @@
<!--
Locate the single instance of the kernel
-->
- <bean name="org.jboss.soa.bpel.runtime.util:service=KernelLocator"
+ <bean name="org.jboss.soa.dsp:service=KernelLocator"
class="org.jboss.soa.dsp.server.jboss.KernelLocator">
<property name="kernel">
<inject bean="jboss.kernel:service=Kernel" />
@@ -33,7 +33,7 @@
<!--
ServerConfig
-->
- <bean name="org.jboss.soa.bpel.runtime.util:service=ServerConfig"
+ <bean name="org.jboss.soa.dsp:service=ServerConfig"
class="org.jboss.soa.dsp.server.jboss.ServerConfigImpl">
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="webServiceHost">${jboss.bind.address}</property>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2010-11-24 16:39:43 UTC (rev 1149)
+++ trunk/pom.xml 2010-11-24 18:35:12 UTC (rev 1150)
@@ -230,10 +230,15 @@
<version>${riftsaw.engine.version}</version>
</dependency>
<dependency>
- <groupId>org.jboss.soa</groupId>
- <artifactId>dsp</artifactId>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-api</artifactId>
<version>${dsp.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-jboss</artifactId>
+ <version>${dsp.version}</version>
+ </dependency>
<!-- ODE1.3.3 dependencies -->
<dependency>
<groupId>org.jboss.soa.bpel</groupId>
Modified: trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml
===================================================================
--- trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml 2010-11-24 16:39:43 UTC (rev 1149)
+++ trunk/runtime/clustering/src/main/resources/META-INF/jboss-beans.xml 2010-11-24 18:35:12 UTC (rev 1150)
@@ -24,7 +24,7 @@
<!--
Locate the single instance of the kernel
-->
- <bean name="org.jboss.soa.bpel.runtime.util:service=KernelLocator"
+ <bean name="org.jboss.soa.dsp:service=KernelLocator"
class="org.jboss.soa.dsp.server.jboss.KernelLocator">
<property name="kernel">
<inject bean="jboss.kernel:service=Kernel" />
@@ -34,7 +34,7 @@
<!--
ServerConfig
-->
- <bean name="org.jboss.soa.bpel.runtime.util:service=ServerConfig"
+ <bean name="org.jboss.soa.dsp:service=ServerConfig"
class="org.jboss.soa.dsp.server.jboss.ServerConfigImpl">
<property name="mbeanServer"><inject bean="JMXKernel" property="mbeanServer"/></property>
<property name="webServiceHost">${jboss.bind.address}</property>
Modified: trunk/runtime/engine/pom.xml
===================================================================
--- trunk/runtime/engine/pom.xml 2010-11-24 16:39:43 UTC (rev 1149)
+++ trunk/runtime/engine/pom.xml 2010-11-24 18:35:12 UTC (rev 1150)
@@ -43,9 +43,13 @@
</dependency>
<dependency>
- <groupId>org.jboss.soa</groupId>
- <artifactId>dsp</artifactId>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-jboss</artifactId>
+ </dependency>
<!-- ODE2 dependencies
<dependency>
Modified: trunk/runtime/engine-assembly/src/main/assembly/sar.xml
===================================================================
--- trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2010-11-24 16:39:43 UTC (rev 1149)
+++ trunk/runtime/engine-assembly/src/main/assembly/sar.xml 2010-11-24 18:35:12 UTC (rev 1150)
@@ -57,7 +57,8 @@
<include>org.jboss.soa.bpel:riftsaw-dao-jpa-hibernate</include>
<!--include>org.jboss.soa.bpel:riftsaw-dao-hibernate</include-->
<include>org.jboss.soa.bpel.runtime:riftsaw-engine</include>
- <include>org.jboss.soa:dsp</include>
+ <include>org.jboss.soa.dsp:dsp-api</include>
+ <include>org.jboss.soa.dsp:dsp-jboss</include>
<include>org.jboss.soa.bpel:riftsaw-jacob</include>
<include>org.jboss.soa.bpel:riftsaw-scheduler-simple</include>
<include>org.jboss.soa.bpel.runtime:riftsaw-uddi</include>
Modified: trunk/runtime/jbossesb-bpel/pom.xml
===================================================================
--- trunk/runtime/jbossesb-bpel/pom.xml 2010-11-24 16:39:43 UTC (rev 1149)
+++ trunk/runtime/jbossesb-bpel/pom.xml 2010-11-24 18:35:12 UTC (rev 1150)
@@ -20,11 +20,15 @@
<artifactId>riftsaw-engine</artifactId>
<version>${riftsaw.engine.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-jboss</artifactId>
+ </dependency>
<dependency>
- <groupId>org.jboss.soa</groupId>
- <artifactId>dsp</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.soa.bpel.dependencies.esb</groupId>
<artifactId>jbossesb-rosetta</artifactId>
<version>${jbossesb.version}</version>
Modified: trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml
===================================================================
--- trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml 2010-11-24 16:39:43 UTC (rev 1149)
+++ trunk/runtime/jbossesb-bpel-assembly/src/main/assembly/esb.xml 2010-11-24 18:35:12 UTC (rev 1150)
@@ -41,7 +41,8 @@
<outputDirectory>/lib</outputDirectory>
<includes>
<include>org.jboss.soa.bpel.runtime:riftsaw-engine</include>
- <include>org.jboss.soa:dsp</include>
+ <include>org.jboss.soa.dsp:dsp-api</include>
+ <include>org.jboss.soa.dsp:dsp-jboss</include>
<include>org.jboss.soa.bpel.dependencies.esb:jbossesb-rosetta</include>
<include>org.jboss.soa.bpel:riftsaw-agents</include>
<include>org.jboss.soa.bpel:riftsaw-bpel-runtime</include>
Modified: trunk/runtime/uddi/pom.xml
===================================================================
--- trunk/runtime/uddi/pom.xml 2010-11-24 16:39:43 UTC (rev 1149)
+++ trunk/runtime/uddi/pom.xml 2010-11-24 18:35:12 UTC (rev 1150)
@@ -35,10 +35,14 @@
<artifactId>riftsaw-engine</artifactId>
<version>${riftsaw.engine.version}</version>
</dependency>
- <dependency>
- <groupId>org.jboss.soa</groupId>
- <artifactId>dsp</artifactId>
+ <dependency>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-api</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.soa.dsp</groupId>
+ <artifactId>dsp-jboss</artifactId>
+ </dependency>
<dependency>
<groupId>wsdl4j</groupId>
14 years, 1 month