You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by di...@apache.org on 2007/05/01 15:56:53 UTC
svn commit: r534094 - in /webservices/axis2/trunk/java:
modules/parent/pom.xml modules/scripting/pom.xml
modules/scripting/src/org/apache/axis2/scripting/ScriptRepositoryListener.java
pom.xml
Author: dims
Date: Tue May 1 06:56:52 2007
New Revision: 534094
URL: http://svn.apache.org/viewvc?view=rev&rev=534094
Log:
hookup scripting module to m2 build
Added:
webservices/axis2/trunk/java/modules/scripting/pom.xml
Modified:
webservices/axis2/trunk/java/modules/parent/pom.xml
webservices/axis2/trunk/java/modules/scripting/src/org/apache/axis2/scripting/ScriptRepositoryListener.java
webservices/axis2/trunk/java/pom.xml
Modified: webservices/axis2/trunk/java/modules/parent/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/parent/pom.xml?view=diff&rev=534094&r1=534093&r2=534094
==============================================================================
--- webservices/axis2/trunk/java/modules/parent/pom.xml (original)
+++ webservices/axis2/trunk/java/modules/parent/pom.xml Tue May 1 06:56:52 2007
@@ -81,7 +81,8 @@
<backport.util.concurrent.version>2.2</backport.util.concurrent.version>
<bcel.version>5.2</bcel.version>
<bcprov.version>jdk13-133</bcprov.version>
- <commons.codec.version>1.3</commons.codec.version>
+ <bsf.version>2.4.0</bsf.version>
+ <commons.codec.version>1.3</commons.codec.version>
<commons.fileupload.version>1.1.1</commons.fileupload.version>
<commons.httpclient.version>3.0.1</commons.httpclient.version>
<commons.io.version>1.2</commons.io.version>
@@ -109,6 +110,7 @@
<maven.version>2.0.6</maven.version>
<neethi.version>SNAPSHOT</neethi.version>
<plexus.utils.version>1.1</plexus.utils.version>
+ <rhino.version>1.6R5</rhino.version>
<servlet.api.version>2.3</servlet.api.version>
<spring.version>1.2.8</spring.version>
<stax.api.version>1.0.1</stax.api.version>
@@ -445,8 +447,8 @@
<dependencyManagement>
<dependencies>
<dependency>
- <groupId>com.sun.xml.fastinfoset</groupId>
- <artifactId>FastInfoset</artifactId>
+ <groupId>com.sun.xml.fastinfoset</groupId>
+ <artifactId>FastInfoset</artifactId>
<version>${fi.version}</version>
</dependency>
<dependency>
@@ -759,6 +761,16 @@
<artifactId>extensions</artifactId>
<version>${intellij.version}</version>
</dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ <version>${rhino.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>${bsf.version}</version>
+ </dependency>
</dependencies>
</dependencyManagement>
<distributionManagement>
Added: webservices/axis2/trunk/java/modules/scripting/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/scripting/pom.xml?view=auto&rev=534094
==============================================================================
--- webservices/axis2/trunk/java/modules/scripting/pom.xml (added)
+++ webservices/axis2/trunk/java/modules/scripting/pom.xml Tue May 1 06:56:52 2007
@@ -0,0 +1,103 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ !
+ ! Copyright 2006 The Apache Software Foundation.
+ !
+ ! 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.
+ !-->
+<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.axis2</groupId>
+ <artifactId>axis2-parent</artifactId>
+ <version>SNAPSHOT</version>
+ <relativePath>../parent/pom.xml</relativePath>
+ </parent>
+ <artifactId>axis2-scripting</artifactId>
+ <packaging>jar</packaging>
+ <name>Apache Axis 2.0 - Scripting</name>
+ <description>Axis2 scripting support for services implemented with scripting languages</description>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-kernel</artifactId>
+ <version>${version}</version>
+ </dependency>
+ <dependency>
+ <groupId>rhino</groupId>
+ <artifactId>js</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>xmlbeans</groupId>
+ <artifactId>xbean</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ </dependency>
+ </dependencies>
+ <build>
+ <sourceDirectory>src</sourceDirectory>
+ <testSourceDirectory>test</testSourceDirectory>
+ <resources>
+ <resource>
+ <directory>conf</directory>
+ <excludes>
+ <exclude>**/*.properties</exclude>
+ </excludes>
+ <filtering>false</filtering>
+ </resource>
+ <resource>
+ <directory>src</directory>
+ <excludes>
+ <exclude>**/*.java</exclude>
+ </excludes>
+ </resource>
+ </resources>
+ <testResources>
+ <testResource>
+ <targetPath>../test-resources</targetPath>
+ <directory>test-resources</directory>
+ <includes>
+ <include>**/**</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <inherited>true</inherited>
+ <configuration>
+ <skip>false</skip>
+ <includes>
+ <include>**/*Test.java</include>
+ <include>**/TestUtils.java</include>
+ </includes>
+ <excludes>
+ <exclude>**/ScriptModuleTest.java</exclude>
+ <exclude>**/ScriptDeploymentEngineTest.java</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-mar-maven-plugin</artifactId>
+ <version>${version}</version>
+ <extensions>true</extensions>
+ <configuration>
+ <includeDependencies>false</includeDependencies>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Modified: webservices/axis2/trunk/java/modules/scripting/src/org/apache/axis2/scripting/ScriptRepositoryListener.java
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/modules/scripting/src/org/apache/axis2/scripting/ScriptRepositoryListener.java?view=diff&rev=534094&r1=534093&r2=534094
==============================================================================
--- webservices/axis2/trunk/java/modules/scripting/src/org/apache/axis2/scripting/ScriptRepositoryListener.java (original)
+++ webservices/axis2/trunk/java/modules/scripting/src/org/apache/axis2/scripting/ScriptRepositoryListener.java Tue May 1 06:56:52 2007
@@ -22,6 +22,7 @@
import org.apache.axis2.deployment.DeploymentEngine;
import org.apache.axis2.deployment.RepositoryListener;
+import org.apache.axis2.deployment.repository.util.WSInfo;
/**
* An Axis2 RepositoryListener subclass for dealing with script services
@@ -42,11 +43,11 @@
if (files != null && files.length > 0) {
for (int i = 0; i < files.length; i++) {
- wsInfoList.addWSInfoItem(files[i], TYPE_SERVICE);
+ wsInfoList.addWSInfoItem(files[i], deploymentEngine.getModuleDeployer());
}
}
- wsInfoList.addWSInfoItem(null, TYPE_DEFAULT);
+ wsInfoList.addWSInfoItem(null, deploymentEngine.getModuleDeployer());
}
/*
Modified: webservices/axis2/trunk/java/pom.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/java/pom.xml?view=diff&rev=534094&r1=534093&r2=534094
==============================================================================
--- webservices/axis2/trunk/java/pom.xml (original)
+++ webservices/axis2/trunk/java/pom.xml Tue May 1 06:56:52 2007
@@ -42,7 +42,7 @@
<module>modules/mtompolicy</module>
<module>modules/parent</module>
<module>modules/ping</module>
- <!--<module>modules/scripting</module>-->
+ <module>modules/scripting</module>
<!--<module>modules/soapmonitor</module>-->
<module>modules/spring</module>
<module>modules/tool/axis2-aar-maven-plugin</module>
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org