Added: incubator/servicemix/trunk/tooling/xfire-maven-plugin/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/xfire-maven-plugin/pom.xml?view=auto&rev=491837
==============================================================================
--- incubator/servicemix/trunk/tooling/xfire-maven-plugin/pom.xml (added)
+++ incubator/servicemix/trunk/tooling/xfire-maven-plugin/pom.xml Tue Jan 2
08:31:06 2007
@@ -0,0 +1,93 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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";>
+
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements. See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You 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.
+-->
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix.tooling</groupId>
+ <artifactId>tooling</artifactId>
+ <version>3.1-incubating-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>xfire-maven-plugin</artifactId>
+ <packaging>maven-plugin</packaging>
+ <name>ServiceMix :: Maven2 XFire Plugin</name>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-plugin-api</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-project</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-archiver</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+ <dependency>
+ <groupId>org.codehaus.plexus</groupId>
+ <artifactId>plexus-utils</artifactId>
+ <version>1.0.5</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.maven</groupId>
+ <artifactId>maven-script-ant</artifactId>
+ <version>2.0.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.xfire</groupId>
+ <artifactId>xfire-generator</artifactId>
+ <version>${xfire-version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.codehaus.xfire</groupId>
+ <artifactId>xfire-jaxws</artifactId>
+ <version>${xfire-version}</version>
+ </dependency>
+
+ <!-- this to solve a potential issue with class loaders -->
+ <dependency>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ <version>1.2.13</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.3</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ </dependencies>
+
+ <properties>
+ <topDirectoryLocation>../..</topDirectoryLocation>
+ </properties>
+
+</project>
Propchange: incubator/servicemix/trunk/tooling/xfire-maven-plugin/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: incubator/servicemix/trunk/tooling/xfire-maven-plugin/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange: incubator/servicemix/trunk/tooling/xfire-maven-plugin/pom.xml
------------------------------------------------------------------------------
svn:mime-type = text/xml
Added:
incubator/servicemix/trunk/tooling/xfire-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/xfire/WsdlgenMojo.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/xfire-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/xfire/WsdlgenMojo.java?view=auto&rev=491837
==============================================================================
---
incubator/servicemix/trunk/tooling/xfire-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/xfire/WsdlgenMojo.java
(added)
+++
incubator/servicemix/trunk/tooling/xfire-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/xfire/WsdlgenMojo.java
Tue Jan 2 08:31:06 2007
@@ -0,0 +1,306 @@
+/*
+ * 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.apache.servicemix.maven.plugin.xfire;
+
+import org.codehaus.xfire.gen.WsdlGenTask;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.model.Resource;
+import org.apache.maven.artifact.Artifact;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.AntClassLoader;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.BuildListener;
+import org.apache.tools.ant.BuildEvent;
+import org.codehaus.xfire.spring.XFireConfigLoader;
+
+import java.util.List;
+import java.util.Iterator;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.io.File;
+import java.net.URLClassLoader;
+import java.net.URL;
+import java.net.MalformedURLException;
+
+/**
+ * WsdlGen mojo.
+ * <p/>
+ * Implemented as a wrapper around the XFire WsdlGen Ant task.
+ *
+ * @author <a href="[EMAIL PROTECTED]">Jerome Lacoste</a>
+ * @version $Id$
+ * @goal wsdlgen
+ * @requiresProject
+ * @requiresDependencyResolution
+ */
+public class WsdlgenMojo
+ extends AbstractMojo
+{
+ /**
+ * Project.
+ *
+ * @parameter expression="${project}"
+ * @required
+ * @readonly
+ */
+ private MavenProject project;
+
+ /**
+ * xfire service.xml config files
+ * If not specified, the list will contain a single value
'src/main/resources/META-INF/xfire/services.xml'
+ *
+ * @parameter
+ */
+ private List configs;
+
+ /**
+ * The directory will be added as Project's Resource.
+ * @parameter expression="${outputDirectory}"
default-value="${project.build.directory}/generated-sources/xfire/wsdlgen"
+ * @required
+ */
+ private File outputDirectory;
+
+ /**
+ * The basedir of the project.
+ *
+ * @parameter expression="${basedir}"
+ * @required
+ * @readonly
+ */
+ private File basedir;
+
+ /*
+ private PrintStream systemErr;
+ private PrintStream systemOut;
+ private final PrintStream mySystemErr = new PrintStream(new
WsdlgenMojo.MyErrorStream());
+ private final PrintStream mySystemOut = new PrintStream(new
WsdlgenMojo.MyOutputStream());
+
+ public void execute()
+ throws MojoExecutionException
+ {
+
+ systemErr = System.err;
+ systemOut = System.out;
+ System.setErr(mySystemErr);
+ // System.setOut(mySystemOut); // causes java.lang.OutOfMemoryError:
Java heap space on my box
+
+ try {
+ exec();
+ } finally {
+ System.setErr( systemErr );
+ // System.setOut( systemOut );
+ }
+ }
+
+ class MyErrorStream extends OutputStream {
+ private StringBuffer buffer = new StringBuffer();
+
+ public void write( final int b ) throws IOException {
+ final char c = (char) b;
+ // shouldn't we handle '\r' as well ??
+ if (c == '\n') {
+ getLog().error( buffer );
+ buffer = new StringBuffer();
+ } else {
+ buffer.append( c );
+ }
+ }
+ }
+
+ class MyOutputStream extends OutputStream {
+ private StringBuffer buffer = new StringBuffer();
+
+ public void write( final int b ) throws IOException {
+ final char c = (char) b;
+ // shouldn't we handle '\r' as well ??
+ if (c == '\n') {
+ getLog().info( buffer );
+ buffer = new StringBuffer();
+ } else {
+ buffer.append( c );
+ }
+ }
+ }
+*/
+
+ public void execute() throws MojoExecutionException {
+
+ if ( configs == null )
+ {
+ configs = new ArrayList();
+ }
+
+ if ( configs.size() == 0 )
+ {
+ configs.add( new File( basedir,
"src/main/resources/META-INF/xfire/services.xml" ).getPath() );
+ }
+
+ if ( ! outputDirectory.exists() && ! outputDirectory.mkdirs() ) {
+ getLog().warn( "the output directory " + outputDirectory
+ + " doesn't exist and couldn't be created. The goal with
probably fail." );
+ }
+
+ final Project antProject = new Project();
+
+ antProject.addBuildListener(new WsdlgenMojo.DebugAntBuildListener());
+
+ // add current pom dependencies to WsdlGenTask class loader
+ ClassLoader parent = WsdlGenTask.class.getClassLoader();
+
+ URL[] urls;
+ try {
+ Collection l = project.getArtifacts();
+ List theurls = new ArrayList();
+ theurls.add(new
File(project.getBuild().getOutputDirectory()).toURL());
+ int i = 0;
+ for (Iterator iterator = l.iterator(); iterator.hasNext();) {
+ Artifact dep = (Artifact) iterator.next();
+ theurls.add(dep.getFile().toURL());
+ }
+ urls = (URL[]) theurls.toArray(new URL[theurls.size()]);
+
+ getLog().debug( "classloader classpath: " + theurls );
+
+ } catch (MalformedURLException e) {
+ throw new IllegalStateException(e);
+ }
+
+ URLClassLoader cl = new URLClassLoader(urls, parent);
+
+ // displayClasspath(cl, "using classpath");
+ // load("javax.servlet.ServletException", cl);
+ // load("org.codehaus.xfire.transport.http.XFireServletController",
cl);
+
+ final WsdlGenTask task = new WsdlGenTask();
+
+ task.setOverridingContextClassLoader(cl);
+
+ task.setProject( antProject );
+
+ task.setOutputDirectory( outputDirectory.getAbsolutePath() );
+
+ for (Iterator iterator = configs.iterator(); iterator.hasNext();) {
+ String configUrl = (String) iterator.next();
+
+ // required for multi-modules projects
+ if ( ! new File( configUrl ).exists() ) {
+ getLog().warn( "configUrl not found. Task will perhaps fail"
);
+ }
+
+ task.setConfigUrl( configUrl );
+
+ getLog().info( "Executing XFire WsdlGen task for configUrl: " +
configUrl );
+
+ try
+ {
+ task.execute();
+ }
+ catch ( BuildException e )
+ {
+ throw new MojoExecutionException( "command execution failed",
e );
+ }
+
+ getLog().debug( "generated " + task.getGeneratedFile());
+ }
+
+ getLog().debug( "Adding outputDirectory as Project's resource.");
+ Resource resource = new Resource();
+ resource.setDirectory(outputDirectory.getAbsolutePath());
+ project.addResource(resource);
+ }
+/*
+ void displayClasspath(URLClassLoader cl, String message)
+ {
+ URL[] urls = cl.getURLs();
+ for (int i = 0; i < urls.length; i++) {
+ URL urL = urls[i];
+ getLog().info("URL " + i + ":" + urL);
+ }
+ }
+*/
+ private void displayClasspath(ClassLoader classLoader, String message)
+ {
+ getLog().info("------ " + message + ":" + classLoader);
+ if (classLoader == null)
+ {
+ return;
+ }
+ if ( classLoader instanceof URLClassLoader )
+ {
+ URLClassLoader cl = (URLClassLoader) classLoader;
+ URL[] urls = cl.getURLs();
+ for (int i = 0; i < urls.length; i++) {
+ URL urL = urls[i];
+ getLog().info("URL " + i + ":" + urL);
+ }
+ }
+ else if ( classLoader instanceof AntClassLoader)
+ {
+ AntClassLoader cl = (AntClassLoader)
XFireConfigLoader.class.getClassLoader();
+ String[] urls = cl.getClasspath().split(File.pathSeparator);
+ for (int i = 0; i < urls.length; i++)
+ {
+ String url = urls[i];
+ getLog().info("URL " + i + ":" + url);
+ }
+ } else
+ {
+ // not handled
+ }
+ displayClasspath(classLoader.getParent(), "parent->" + message);
+ }
+
+ void load(String className, ClassLoader cl) {
+ try {
+ Class c = Class.forName(className, true, cl);
+ getLog().debug(c.toString());
+ } catch (Exception e) {
+ displayClasspath(cl, "using classpath");
+ getLog().error(e);
+ }
+ }
+
+ private class DebugAntBuildListener implements BuildListener {
+ public void buildStarted( final BuildEvent buildEvent ) {
+ getLog().debug(buildEvent.getMessage());
+ }
+
+ public void buildFinished( final BuildEvent buildEvent ) {
+ getLog().debug(buildEvent.getMessage());
+ }
+
+ public void targetStarted( final BuildEvent buildEvent ) {
+ getLog().debug(buildEvent.getMessage());
+ }
+
+ public void targetFinished( final BuildEvent buildEvent ) {
+ getLog().debug(buildEvent.getMessage());
+ }
+
+ public void taskStarted( final BuildEvent buildEvent ) {
+ getLog().debug(buildEvent.getMessage());
+ }
+
+ public void taskFinished( final BuildEvent buildEvent ) {
+ getLog().debug(buildEvent.getMessage());
+ }
+
+ public void messageLogged( final BuildEvent buildEvent ) {
+ getLog().debug(buildEvent.getMessage());
+ }
+ }
+}
Propchange:
incubator/servicemix/trunk/tooling/xfire-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/xfire/WsdlgenMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/servicemix/trunk/tooling/xfire-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/xfire/WsdlgenMojo.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange:
incubator/servicemix/trunk/tooling/xfire-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/xfire/WsdlgenMojo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Added:
incubator/servicemix/trunk/tooling/xfire-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/xfire/WsgenMojo.java
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/tooling/xfire-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/xfire/WsgenMojo.java?view=auto&rev=491837
==============================================================================
---
incubator/servicemix/trunk/tooling/xfire-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/xfire/WsgenMojo.java
(added)
+++
incubator/servicemix/trunk/tooling/xfire-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/xfire/WsgenMojo.java
Tue Jan 2 08:31:06 2007
@@ -0,0 +1,224 @@
+/*
+ * 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.apache.servicemix.maven.plugin.xfire;
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.Project;
+import org.apache.tools.ant.BuildListener;
+import org.apache.tools.ant.BuildEvent;
+
+import org.codehaus.xfire.gen.WsGenTask;
+
+import java.io.*;
+import java.util.Iterator;
+import java.util.List;
+
+/**
+ * WsGen mojo.
+ * <p/>
+ * Implemented as a wrapper around the XFire WsGen Ant task.
+ *
+ * @author <a href="[EMAIL PROTECTED]">Jerome Lacoste</a>
+ * @version $Id$
+ * @goal wsgen
+ * @phase generate-sources
+ * @requiresProject
+ * @requiresDependencyResolution
+ */
+public class WsgenMojo
+ extends AbstractMojo
+{
+ /**
+ * Project.
+ *
+ * @parameter expression="${project}"
+ * @required
+ * @readonly
+ */
+ private MavenProject project;
+
+ /**
+ * URLs
+ *
+ * @parameter
+ * @required
+ */
+ private List wsdls;
+
+ /**
+ * @parameter expression="${package}" alias="package"
+ */
+ private String _package; // reserved keyword...
+
+ /**
+ * @parameter expression="${profile}"
+ */
+ private String profile;
+
+ /**
+ * @parameter expression="${binding}"
+ */
+ private String binding;
+
+ /**
+ * Will be added to the compileSourceRoot
+ * @parameter expression="${outputDirectory}"
default-value="${project.build.directory}/generated-sources/xfire/wsgen"
+ * @required
+ */
+ private File outputDirectory;
+
+ private PrintStream systemErr;
+ private PrintStream systemOut;
+ private final PrintStream mySystemErr = new PrintStream(new
MyErrorStream());
+ private final PrintStream mySystemOut = new PrintStream(new
MyOutputStream());
+
+ public void execute()
+ throws MojoExecutionException
+ {
+
+ systemErr = System.err;
+ systemOut = System.out;
+ System.setErr(mySystemErr);
+ // System.setOut(mySystemOut); // causes java.lang.OutOfMemoryError:
Java heap space on my box
+
+ try {
+ exec();
+ } finally {
+ System.setErr( systemErr );
+ // System.setOut( systemOut );
+ }
+ }
+
+ class MyErrorStream extends OutputStream {
+ private StringBuffer buffer = new StringBuffer();
+
+ public void write( final int b ) throws IOException {
+ final char c = (char) b;
+ // shouldn't we handle '\r' as well ??
+ if (c == '\n') {
+ getLog().error( buffer );
+ buffer = new StringBuffer();
+ } else {
+ buffer.append( c );
+ }
+ }
+ }
+
+ class MyOutputStream extends OutputStream {
+ private StringBuffer buffer = new StringBuffer();
+
+ public void write( final int b ) throws IOException {
+ final char c = (char) b;
+ // shouldn't we handle '\r' as well ??
+ if (c == '\n') {
+ getLog().info( buffer );
+ buffer = new StringBuffer();
+ } else {
+ buffer.append( c );
+ }
+ }
+ }
+
+ private void exec() throws MojoExecutionException {
+
+ if ( wsdls.size() == 0 ) {
+ return;
+ }
+
+ if ( ! outputDirectory.exists() && ! outputDirectory.mkdirs() ) {
+ getLog().warn( "the output directory " + outputDirectory
+ + " doesn't exist and couldn't be created. The goal with
probably fail." );
+ }
+
+ final Project antProject = new Project();
+
+ antProject.addBuildListener(new DebugAntBuildListener());
+
+ final WsGenTask task = new WsGenTask();
+
+ task.setProject( antProject );
+
+ if ( binding != null) {
+ task.setBinding( binding );
+ }
+
+ if ( profile != null) {
+ task.setProfile( profile );
+ }
+
+ if ( _package != null) {
+ task.setPackage( _package );
+ }
+
+ task.setOutputDirectory( outputDirectory.getAbsolutePath() );
+
+ for (Iterator iterator = wsdls.iterator(); iterator.hasNext();) {
+ String wsdlUrl = (String) iterator.next();
+
+ if ( ! wsdlUrl.contains("://") ) {
+ wsdlUrl = new File( wsdlUrl ).toURI().toString();
+ }
+
+ task.setWsdl( wsdlUrl );
+
+ getLog().info( "Executing XFire WsGen task with url: " + wsdlUrl );
+
+ try
+ {
+ task.execute();
+ }
+ catch ( BuildException e )
+ {
+ throw new MojoExecutionException( "command execution failed",
e );
+ }
+ }
+
+ getLog().debug( "Adding outputDirectory to source root: " +
outputDirectory );
+
+ this.project.addCompileSourceRoot( outputDirectory.getAbsolutePath() );
+ }
+
+ private class DebugAntBuildListener implements BuildListener {
+ public void buildStarted( final BuildEvent buildEvent ) {
+ getLog().debug(buildEvent.getMessage());
+ }
+
+ public void buildFinished( final BuildEvent buildEvent ) {
+ getLog().debug(buildEvent.getMessage());
+ }
+
+ public void targetStarted( final BuildEvent buildEvent ) {
+ getLog().debug(buildEvent.getMessage());
+ }
+
+ public void targetFinished( final BuildEvent buildEvent ) {
+ getLog().debug(buildEvent.getMessage());
+ }
+
+ public void taskStarted( final BuildEvent buildEvent ) {
+ getLog().debug(buildEvent.getMessage());
+ }
+
+ public void taskFinished( final BuildEvent buildEvent ) {
+ getLog().debug(buildEvent.getMessage());
+ }
+
+ public void messageLogged( final BuildEvent buildEvent ) {
+ getLog().debug(buildEvent.getMessage());
+ }
+ }
+}
Propchange:
incubator/servicemix/trunk/tooling/xfire-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/xfire/WsgenMojo.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange:
incubator/servicemix/trunk/tooling/xfire-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/xfire/WsgenMojo.java
------------------------------------------------------------------------------
svn:keywords = Date Revision
Propchange:
incubator/servicemix/trunk/tooling/xfire-maven-plugin/src/main/java/org/apache/servicemix/maven/plugin/xfire/WsgenMojo.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/servicemix/trunk/web/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/web/pom.xml?view=diff&rev=491837&r1=491836&r2=491837
==============================================================================
--- incubator/servicemix/trunk/web/pom.xml (original)
+++ incubator/servicemix/trunk/web/pom.xml Tue Jan 2 08:31:06 2007
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
+<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";>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -15,29 +17,25 @@
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.
-
-->
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";>
- <modelVersion>4.0.0</modelVersion>
-
- <parent>
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.servicemix</groupId>
+ <artifactId>servicemix</artifactId>
+ <version>3.1-incubating-SNAPSHOT</version>
+ </parent>
+
<groupId>org.apache.servicemix</groupId>
- <artifactId>servicemix</artifactId>
+ <artifactId>web</artifactId>
<version>3.1-incubating-SNAPSHOT</version>
- </parent>
+ <name>ServiceMix :: Web Apps</name>
+ <packaging>pom</packaging>
+
+ <modules>
+ <module>servicemix-console</module>
+ <module>servicemix-web-console</module>
+ </modules>
- <groupId>org.apache.servicemix</groupId>
- <artifactId>web</artifactId>
- <version>3.1-incubating-SNAPSHOT</version>
- <name>ServiceMix :: Web Apps</name>
- <packaging>pom</packaging>
-
- <modules>
- <module>servicemix-console</module>
- <module>servicemix-web-console</module>
- </modules>
-
</project>
Modified: incubator/servicemix/trunk/web/servicemix-console/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/web/servicemix-console/pom.xml?view=diff&rev=491837&r1=491836&r2=491837
==============================================================================
--- incubator/servicemix/trunk/web/servicemix-console/pom.xml (original)
+++ incubator/servicemix/trunk/web/servicemix-console/pom.xml Tue Jan 2
08:31:06 2007
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
+<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";>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -15,11 +17,7 @@
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.
-
-->
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";>
<modelVersion>4.0.0</modelVersion>
@@ -115,13 +113,20 @@
<configuration>
<connectors>
<connector
implementation="org.mortbay.jetty.nio.SelectChannelConnector">
- <port>9090</port>
+ <port>${jetty.port}</port>
<maxIdleTime>60000</maxIdleTime>
</connector>
- </connectors> <scanIntervalSeconds>10</scanIntervalSeconds>
+ </connectors>
+ <scanIntervalSeconds>10</scanIntervalSeconds>
<webAppSourceDirectory>${basedir}/src/webapp</webAppSourceDirectory>
</configuration>
</plugin>
</plugins>
</build>
+
+ <properties>
+ <jetty.port>8080</jetty.port>
+ <topDirectoryLocation>../..</topDirectoryLocation>
+ </properties>
+
</project>
Modified: incubator/servicemix/trunk/web/servicemix-web-console/pom.xml
URL:
http://svn.apache.org/viewvc/incubator/servicemix/trunk/web/servicemix-web-console/pom.xml?view=diff&rev=491837&r1=491836&r2=491837
==============================================================================
--- incubator/servicemix/trunk/web/servicemix-web-console/pom.xml (original)
+++ incubator/servicemix/trunk/web/servicemix-web-console/pom.xml Tue Jan 2
08:31:06 2007
@@ -1,4 +1,6 @@
<?xml version="1.0" encoding="UTF-8"?>
+<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";>
+
<!--
Licensed to the Apache Software Foundation (ASF) under one or more
@@ -15,11 +17,7 @@
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.
-
-->
-<project
- xsi:schemaLocation="http://maven.apache.org/POM/4.0.0
http://maven.apache.org/maven-v4_0_0.xsd";
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance";
xmlns="http://maven.apache.org/POM/4.0.0";>
<modelVersion>4.0.0</modelVersion>
@@ -32,9 +30,7 @@
<artifactId>servicemix-web-console</artifactId>
<packaging>war</packaging>
<name>ServiceMix :: Web Console</name>
- <properties>
- <jetty.port>8080</jetty.port>
- </properties>
+
<dependencies>
<dependency>
@@ -239,4 +235,10 @@
</plugin>
</plugins>
</build>
+
+ <properties>
+ <jetty.port>8080</jetty.port>
+ <topDirectoryLocation>../..</topDirectoryLocation>
+ </properties>
+
</project>
