You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ri...@apache.org on 2009/10/30 18:57:06 UTC
svn commit: r831403 [2/2] - in /geronimo/server/trunk:
framework/configs/karaf-framework/src/main/history/
framework/modules/geronimo-deployment/src/main/java/org/apache/geronimo/deployment/
framework/modules/geronimo-kernel/src/main/java/org/apache/ge...
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java?rev=831403&r1=831402&r2=831403&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/WsdlGenerator.java Fri Oct 30 17:57:04 2009
@@ -42,39 +42,39 @@
public class WsdlGenerator {
private static final Logger LOG = LoggerFactory.getLogger(WsdlGenerator.class);
-
+
private JAXWSTools jaxwsTools;
private WsdlGeneratorOptions options;
-
+
public WsdlGenerator(WsdlGeneratorOptions options) {
this.options = options;
this.jaxwsTools = new JAXWSTools();
this.jaxwsTools.setOverrideContextClassLoader(true);
-
+
if (options.getSAAJ() == WsdlGeneratorOptions.SAAJ.SUN) {
this.jaxwsTools.setUseSunSAAJ();
} else if (options.getSAAJ() == WsdlGeneratorOptions.SAAJ.Axis2) {
this.jaxwsTools.setUseAxis2SAAJ();
}
}
-
+
private URL[] getWsgenClasspath(DeploymentContext context) throws Exception {
DeploymentConfigurationManager cm = (DeploymentConfigurationManager)context.getConfigurationManager();
Collection<? extends Repository> repositories = cm.getRepositories();
File[] jars = this.jaxwsTools.getClasspath(repositories);
return JAXWSTools.toURL(jars);
}
-
+
private String[] buildArguments(String sei, String classPath, File moduleBaseDir, PortInfo portInfo) {
List<String> arguments = new ArrayList<String>();
-
+
arguments.add("-cp");
arguments.add(classPath);
arguments.add("-keep");
arguments.add("-wsdl");
arguments.add("-d");
arguments.add(moduleBaseDir.getAbsolutePath());
-
+
QName serviceName = this.options.getWsdlService();
if (serviceName != null) {
arguments.add("-servicename");
@@ -86,31 +86,31 @@
arguments.add("-portname");
arguments.add(portName.toString());
}
-
+
arguments.add(sei);
-
+
return arguments.toArray(new String[]{});
}
-
+
private File findWsdlFile(File baseDir, PortInfo portInfo) {
QName serviceQName = this.options.getWsdlService();
String serviceName = (serviceQName == null) ? null : serviceQName.getLocalPart();
return WsdlGeneratorUtils.findWsdlFile(baseDir, serviceName);
}
-
- public String generateWsdl(Module module,
- String serviceClass,
- DeploymentContext context,
+
+ public String generateWsdl(Module module,
+ String serviceClass,
+ DeploymentContext context,
PortInfo portInfo) throws DeploymentException {
//call wsgen tool to generate the wsdl file based on the bindingtype.
//let's set the outputDir as the module base directory in server repository.
File moduleBase = module.getEarContext().getInPlaceConfigurationDir();
- if (moduleBase == null) {
+ if (moduleBase == null) {
moduleBase = module.getEarContext().getBaseDir();
}
File moduleBaseDir = (moduleBase.isFile()) ? moduleBase.getParentFile() : moduleBase;
File baseDir;
-
+
try {
baseDir = WsdlGeneratorUtils.createTempDirectory(moduleBaseDir);
} catch (IOException e) {
@@ -124,7 +124,7 @@
urls = getWsgenClasspath(context);
} catch (Exception e) {
throw new DeploymentException("Failed to generate the wsdl file using wsgen: unable to get the location of the required artifact(s).", e);
- }
+ }
//let's figure out the classpath string for the module and wsgen tools.
if (urls != null && urls.length > 0) {
for (URL url : urls) {
@@ -139,16 +139,16 @@
//create arguments;
String[] arguments = buildArguments(serviceClass, classPath.toString(), baseDir, portInfo);
-
+
try {
boolean result = false;
-
+
if (this.options.getFork()) {
result = forkWsgen(classPath, arguments);
} else {
result = invokeWsgen(urls, arguments);
}
-
+
if (result) {
//check to see if the file is created.
File wsdlFile = findWsdlFile(baseDir, portInfo);
@@ -156,13 +156,14 @@
throw new DeploymentException("Unable to find the service wsdl file");
}
if (this.options.getAddToClassPath()) {
- context.getConfiguration().addToClassPath(baseDir.getName());
+// TODO: This isn't available on configuraitons any more...need to figure out if/how this gets replaced.
+// context.getConfiguration().addToClassPath(baseDir.getName());
}
return WsdlGeneratorUtils.getRelativeNameOrURL(moduleBase, wsdlFile);
} else {
throw new DeploymentException("WSDL generation failed");
- }
-
+ }
+
} catch (DeploymentException e) {
throw e;
} catch (Exception e) {
@@ -174,28 +175,28 @@
ByteArrayOutputStream os = new ByteArrayOutputStream();
boolean rs = this.jaxwsTools.invokeWsgen(jars, os, arguments);
os.close();
-
+
if (!rs) {
LOG.error("WSDL generator failed: {}", getOutput(os));
} else if (LOG.isDebugEnabled()) {
LOG.debug("WSDL generator output: {}", getOutput(os));
}
-
+
return rs;
}
-
+
private static String getOutput(ByteArrayOutputStream os) {
byte [] arr = os.toByteArray();
return new String(arr, 0, arr.length);
}
-
+
private boolean forkWsgen(StringBuilder classPath, String[] arguments) throws Exception {
- List<String> cmd = new ArrayList<String>();
+ List<String> cmd = new ArrayList<String>();
cmd.add("-classpath");
cmd.add(classPath.toString());
cmd.add("com.sun.tools.ws.WsGen");
cmd.addAll(Arrays.asList(arguments));
-
+
try {
return WsdlGeneratorUtils.execJava(cmd, this.options.getForkTimeout());
} catch (Exception e) {
Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml?rev=831403&r1=831402&r2=831403&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws/pom.xml Fri Oct 30 17:57:04 2009
@@ -109,6 +109,11 @@
<type>car</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+ </dependency>
+
</dependencies>
</project>
Modified: geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml?rev=831403&r1=831402&r2=831403&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml Fri Oct 30 17:57:04 2009
@@ -6,19 +6,34 @@
<version>3.0-SNAPSHOT</version>
<type>car</type>
</module-id>
- <dependency start="true">
+ <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-deployer</artifactId>
<type>car</type>
</dependency>
- <dependency start="true">
+ <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>webservices-common</artifactId>
<type>car</type>
</dependency>
- <dependency start="true">
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-jaxws</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jaxws-builder</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-naming-builder</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.wsdl4j</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/jaxws/jaxws-ejb-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-ejb-deployer/src/main/history/dependencies.xml?rev=831403&r1=831402&r2=831403&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-ejb-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-ejb-deployer/src/main/history/dependencies.xml Fri Oct 30 17:57:04 2009
@@ -18,7 +18,17 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-jaxws-builder</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-jaxws-ejb-builder</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-openejb-builder</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml?rev=831403&r1=831402&r2=831403&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/pom.xml Fri Oct 30 17:57:04 2009
@@ -21,13 +21,13 @@
<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>
-
+
<parent>
<groupId>org.apache.geronimo.plugins</groupId>
<artifactId>openejb</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
-
+
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-openejb</artifactId>
<packaging>bundle</packaging>
@@ -87,7 +87,7 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-ejbd</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-multicast</artifactId>
@@ -97,27 +97,27 @@
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-client</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-server</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-loader</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-jee</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-ejbd</artifactId>
</dependency>
-
+
<dependency>
<groupId>org.apache.openejb</groupId>
<artifactId>openejb-javaagent</artifactId>
@@ -148,12 +148,20 @@
<version>${version}</version>
<type>car</type>
</dependency>
-
- <!--<dependency>-->
- <!--<groupId>org.apache.geronimo.modules</groupId>-->
- <!--<artifactId>geronimo-persistence-jpa20</artifactId>-->
- <!--<version>${version}</version>-->
- <!--</dependency>-->
+
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-persistence-jpa20</artifactId>
+ <version>${version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-kernel</artifactId>
+ <version>${version}</version>
+ <classifier>tests</classifier>
+ <scope>test</scope>
+ </dependency>
</dependencies>
</project>
Modified: geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/test/java/org/apache/geronimo/openejb/GBeanTest.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/test/java/org/apache/geronimo/openejb/GBeanTest.java?rev=831403&r1=831402&r2=831403&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/test/java/org/apache/geronimo/openejb/GBeanTest.java (original)
+++ geronimo/server/trunk/plugins/openejb/geronimo-openejb/src/test/java/org/apache/geronimo/openejb/GBeanTest.java Fri Oct 30 17:57:04 2009
@@ -18,32 +18,33 @@
import junit.framework.TestCase;
import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.kernel.osgi.MockBundle;
/**
* @version $Rev$ $Date$
*/
public class GBeanTest extends TestCase {
public void testOpenEjbSystemGBean() {
- GBeanInfo.getGBeanInfo(OpenEjbSystemGBean.class.getName(), getClass().getClassLoader());
+ GBeanInfo.getGBeanInfo(OpenEjbSystemGBean.class.getName(), new MockBundle(getClass().getClassLoader(), "test", 0L));
}
public void testEjbModuleImplGBean() {
- GBeanInfo.getGBeanInfo(EjbModuleImplGBean.class.getName(), getClass().getClassLoader());
+ GBeanInfo.getGBeanInfo(EjbModuleImplGBean.class.getName(), new MockBundle(getClass().getClassLoader(), "test", 0L));
}
public void testEntityDeploymentGBean() {
- GBeanInfo.getGBeanInfo(EntityDeploymentGBean.class.getName(), getClass().getClassLoader());
+ GBeanInfo.getGBeanInfo(EntityDeploymentGBean.class.getName(), new MockBundle(getClass().getClassLoader(), "test", 0L));
}
public void testMessageDrivenDeploymentGBean() {
- GBeanInfo.getGBeanInfo(MessageDrivenDeploymentGBean.class.getName(), getClass().getClassLoader());
+ GBeanInfo.getGBeanInfo(MessageDrivenDeploymentGBean.class.getName(), new MockBundle(getClass().getClassLoader(), "test", 0L));
}
public void testStatefulDeploymentGBean() {
- GBeanInfo.getGBeanInfo(StatefulDeploymentGBean.class.getName(), getClass().getClassLoader());
+ GBeanInfo.getGBeanInfo(StatefulDeploymentGBean.class.getName(), new MockBundle(getClass().getClassLoader(), "test", 0L));
}
public void testStatelessDeploymentGBean() {
- GBeanInfo.getGBeanInfo(StatelessDeploymentGBean.class.getName(), getClass().getClassLoader());
+ GBeanInfo.getGBeanInfo(StatelessDeploymentGBean.class.getName(), new MockBundle(getClass().getClassLoader(), "test", 0L));
}
}
Modified: geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml?rev=831403&r1=831402&r2=831403&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/openejb/openejb/src/main/history/dependencies.xml Fri Oct 30 17:57:04 2009
@@ -7,6 +7,16 @@
<type>car</type>
</module-id>
<dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-impl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>commons-cli</groupId>
+ <artifactId>commons-cli</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>j2ee-server</artifactId>
<type>car</type>
@@ -33,15 +43,30 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-transformer</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
<artifactId>server-security-config</artifactId>
<type>car</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.javamail</groupId>
+ <artifactId>geronimo-javamail_1.4_mail</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-openejb</artifactId>
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-persistence-jpa20</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.plugins.classloaders</groupId>
<artifactId>xbean-finder</artifactId>
<type>car</type>
@@ -92,10 +117,25 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.apache.servicemix.bundles</groupId>
+ <artifactId>org.apache.servicemix.bundles.xmlbeans</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.xbean</groupId>
<artifactId>xbean-asm-shaded</artifactId>
<type>jar</type>
- </dependency>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-naming</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.xbean</groupId>
+ <artifactId>xbean-reflect</artifactId>
+ <type>jar</type>
+ </dependency>
<dependency>
<groupId>org.apache.yoko</groupId>
<artifactId>yoko-spec-corba</artifactId>
@@ -107,8 +147,18 @@
<type>jar</type>
</dependency>
<dependency>
+ <groupId>org.codehaus.woodstox</groupId>
+ <artifactId>wstx-asl</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>quartz</groupId>
<artifactId>quartz</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/system-database/system-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database/pom.xml?rev=831403&r1=831402&r2=831403&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database/pom.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database/pom.xml Fri Oct 30 17:57:04 2009
@@ -27,7 +27,7 @@
<artifactId>system-database</artifactId>
<version>3.0-SNAPSHOT</version>
</parent>
-
+
<groupId>org.apache.geronimo.configs</groupId>
<artifactId>system-database</artifactId>
<name>Geronimo Plugins, System Database :: System Database</name>
@@ -36,7 +36,7 @@
<description>
System database plugin for geronimo. This provides system databse together with its dependencies as one dependency.
</description>
-
+
<dependencies>
<dependency>
<groupId>org.apache.geronimo.framework</groupId>
@@ -87,9 +87,14 @@
<artifactId>tranql-connector-derby-embed-xa</artifactId>
<type>rar</type>
</dependency>
-
+
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-service-builder</artifactId>
+ </dependency>
+
</dependencies>
-
+
<build>
<plugins>
<plugin>
@@ -124,7 +129,19 @@
</instance>
</configuration>
</plugin>
+ <plugin>
+ <groupId>org.apache.felix</groupId>
+ <artifactId>maven-bundle-plugin</artifactId>
+ <configuration>
+ <instructions>
+ <!--packages containing "impl" or "internal" are excluded by default -->
+ <Import-Package>org.apache.xmlbeans.impl.schema;version="2.4",org.apache.geronimo.deployment.xbeans.impl,*</Import-Package>
+ <!--<_versionpolicy>[$(version;==;$(@)),$(version;+;$(@)))</_versionpolicy>-->
+ </instructions>
+ </configuration>
+ </plugin>
+
</plugins>
</build>
-
+
</project>
Modified: geronimo/server/trunk/plugins/system-database/system-database/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/system-database/system-database/src/main/history/dependencies.xml?rev=831403&r1=831402&r2=831403&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/system-database/system-database/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/system-database/system-database/src/main/history/dependencies.xml Fri Oct 30 17:57:04 2009
@@ -17,6 +17,16 @@
<type>car</type>
</dependency>
<dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-management</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.framework</groupId>
+ <artifactId>geronimo-system</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-derby</artifactId>
<type>jar</type>
Modified: geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/src/main/history/dependencies.xml?rev=831403&r1=831402&r2=831403&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/tomcat/tomcat6-clustering-wadi/src/main/history/dependencies.xml Fri Oct 30 17:57:04 2009
@@ -18,6 +18,11 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-clustering-wadi</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-tomcat6-clustering-wadi</artifactId>
<type>jar</type>
</dependency>