You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-commits@axis.apache.org by ve...@apache.org on 2012/10/14 11:30:21 UTC
svn commit: r1398043 - in /axis/axis1/java/trunk: ./ axis-rt-core/
axis-rt-core/src/main/java/org/apache/axis/components/script/
axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/
axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/prov...
Author: veithen
Date: Sun Oct 14 09:30:20 2012
New Revision: 1398043
URL: http://svn.apache.org/viewvc?rev=1398043&view=rev
Log:
Moved the BSF provider to a separate Maven module.
Added:
axis/axis1/java/trunk/axis-rt-provider-bsf/ (with props)
axis/axis1/java/trunk/axis-rt-provider-bsf/pom.xml (with props)
axis/axis1/java/trunk/axis-rt-provider-bsf/src/
axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/
axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/java/
axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/java/org/
axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/java/org/apache/
axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/java/org/apache/axis/
axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/java/org/apache/axis/components/
axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/java/org/apache/axis/components/script/
- copied from r1397948, axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/script/
axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/java/org/apache/axis/deployment/
axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/java/org/apache/axis/deployment/wsdd/
axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/java/org/apache/axis/deployment/wsdd/providers/
axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/java/org/apache/axis/deployment/wsdd/providers/WSDDBsfProvider.java
- copied unchanged from r1397948, axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/providers/WSDDBsfProvider.java
axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/java/org/apache/axis/providers/
axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/java/org/apache/axis/providers/BSFProvider.java
- copied unchanged from r1397948, axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/providers/BSFProvider.java
axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/resources/
axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/resources/META-INF/
axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/resources/META-INF/services/
axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/resources/META-INF/services/org.apache.axis.deployment.wsdd.Provider
Removed:
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/components/script/
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/providers/WSDDBsfProvider.java
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/providers/BSFProvider.java
Modified:
axis/axis1/java/trunk/axis-rt-core/pom.xml
axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDProvider.java
axis/axis1/java/trunk/axis/pom.xml
axis/axis1/java/trunk/pom.xml
Modified: axis/axis1/java/trunk/axis-rt-core/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/pom.xml?rev=1398043&r1=1398042&r2=1398043&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-rt-core/pom.xml (original)
+++ axis/axis1/java/trunk/axis-rt-core/pom.xml Sun Oct 14 09:30:20 2012
@@ -96,12 +96,6 @@
<optional>true</optional>
</dependency>
<dependency>
- <groupId>bsf</groupId>
- <artifactId>bsf</artifactId>
- <version>2.3.0</version>
- <optional>true</optional>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
Modified: axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDProvider.java
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDProvider.java?rev=1398043&r1=1398042&r2=1398043&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDProvider.java (original)
+++ axis/axis1/java/trunk/axis-rt-core/src/main/java/org/apache/axis/deployment/wsdd/WSDDProvider.java Sun Oct 14 09:30:20 2012
@@ -18,7 +18,6 @@ package org.apache.axis.deployment.wsdd;
import org.apache.axis.EngineConfiguration;
import org.apache.axis.Handler;
import org.apache.axis.components.logger.LogFactory;
-import org.apache.axis.deployment.wsdd.providers.WSDDBsfProvider;
import org.apache.axis.deployment.wsdd.providers.WSDDComProvider;
import org.apache.axis.deployment.wsdd.providers.WSDDHandlerProvider;
import org.apache.axis.deployment.wsdd.providers.WSDDJavaCORBAProvider;
@@ -67,7 +66,6 @@ public abstract class WSDDProvider
providers.put(WSDDConstants.QNAME_HANDLER_PROVIDER, new WSDDHandlerProvider());
providers.put(WSDDConstants.QNAME_EJB_PROVIDER, new WSDDJavaEJBProvider());
providers.put(WSDDConstants.QNAME_COM_PROVIDER, new WSDDComProvider());
- providers.put(WSDDConstants.QNAME_BSF_PROVIDER, new WSDDBsfProvider());
providers.put(WSDDConstants.QNAME_CORBA_PROVIDER, new WSDDJavaCORBAProvider());
providers.put(WSDDConstants.QNAME_RMI_PROVIDER, new WSDDJavaRMIProvider());
try {
Propchange: axis/axis1/java/trunk/axis-rt-provider-bsf/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Sun Oct 14 09:30:20 2012
@@ -0,0 +1,4 @@
+.classpath
+.project
+target
+.settings
Added: axis/axis1/java/trunk/axis-rt-provider-bsf/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-provider-bsf/pom.xml?rev=1398043&view=auto
==============================================================================
--- axis/axis1/java/trunk/axis-rt-provider-bsf/pom.xml (added)
+++ axis/axis1/java/trunk/axis-rt-provider-bsf/pom.xml Sun Oct 14 09:30:20 2012
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ ~ 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.
+ -->
+<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.axis</groupId>
+ <artifactId>axis-project</artifactId>
+ <version>1.4.1-SNAPSHOT</version>
+ <relativePath>../pom.xml</relativePath>
+ </parent>
+ <artifactId>axis-rt-provider-bsf</artifactId>
+ <name>BSF Provider</name>
+ <dependencies>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
+ <artifactId>axis-rt-core</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>bsf</groupId>
+ <artifactId>bsf</artifactId>
+ <version>2.3.0</version>
+ </dependency>
+ </dependencies>
+</project>
Propchange: axis/axis1/java/trunk/axis-rt-provider-bsf/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Added: axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/resources/META-INF/services/org.apache.axis.deployment.wsdd.Provider
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/resources/META-INF/services/org.apache.axis.deployment.wsdd.Provider?rev=1398043&view=auto
==============================================================================
--- axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/resources/META-INF/services/org.apache.axis.deployment.wsdd.Provider (added)
+++ axis/axis1/java/trunk/axis-rt-provider-bsf/src/main/resources/META-INF/services/org.apache.axis.deployment.wsdd.Provider Sun Oct 14 09:30:20 2012
@@ -0,0 +1 @@
+org.apache.axis.deployment.wsdd.providers.WSDDBsfProvider
Modified: axis/axis1/java/trunk/axis/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/axis/pom.xml?rev=1398043&r1=1398042&r2=1398043&view=diff
==============================================================================
--- axis/axis1/java/trunk/axis/pom.xml (original)
+++ axis/axis1/java/trunk/axis/pom.xml Sun Oct 14 09:30:20 2012
@@ -48,6 +48,11 @@
</dependency>
<dependency>
<groupId>${project.groupId}</groupId>
+ <artifactId>axis-rt-provider-bsf</artifactId>
+ <version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>${project.groupId}</groupId>
<artifactId>axis-codegen</artifactId>
<version>${project.version}</version>
</dependency>
@@ -73,6 +78,7 @@
<includes>
<include>${project.groupId}:axis-rt-core</include>
<include>${project.groupId}:axis-rt-databinding-castor</include>
+ <include>${project.groupId}:axis-rt-provider-bsf</include>
<include>${project.groupId}:axis-codegen</include>
<include>${project.groupId}:axis-tools</include>
</includes>
Modified: axis/axis1/java/trunk/pom.xml
URL: http://svn.apache.org/viewvc/axis/axis1/java/trunk/pom.xml?rev=1398043&r1=1398042&r2=1398043&view=diff
==============================================================================
--- axis/axis1/java/trunk/pom.xml (original)
+++ axis/axis1/java/trunk/pom.xml Sun Oct 14 09:30:20 2012
@@ -64,6 +64,7 @@
<module>axis-jms</module>
<module>axis-rt-core</module>
<module>axis-rt-databinding-castor</module>
+ <module>axis-rt-provider-bsf</module>
<module>axis-rt-transports-http-javanet</module>
<module>axis-saaj</module>
<module>axis-standalone-server</module>