[savara-commits] savara SVN: r385 - in trunk: distribution/src/main/assembly and 16 other directories.

do-not-reply at jboss.org do-not-reply at jboss.org
Thu Sep 2 10:09:01 EDT 2010


Author: objectiser
Date: 2010-09-02 10:08:59 -0400 (Thu, 02 Sep 2010)
New Revision: 385

Added:
   trunk/validators/jboss/wsnative/
   trunk/validators/jboss/wsnative/pom.xml
   trunk/validators/jboss/wsnative/src/
   trunk/validators/jboss/wsnative/src/main/
   trunk/validators/jboss/wsnative/src/main/configs/
   trunk/validators/jboss/wsnative/src/main/configs/META-INF/
   trunk/validators/jboss/wsnative/src/main/configs/META-INF/jboss-beans.xml
   trunk/validators/jboss/wsnative/src/main/configs/META-INF/jboss-scanning.xml
   trunk/validators/jboss/wsnative/src/main/configs/META-INF/jboss-structure.xml
   trunk/validators/jboss/wsnative/src/main/configs/ws-native-assembly.xml
   trunk/validators/jboss/wsnative/src/main/java/
   trunk/validators/jboss/wsnative/src/main/java/org/
   trunk/validators/jboss/wsnative/src/main/java/org/jboss/
   trunk/validators/jboss/wsnative/src/main/java/org/jboss/savara/
   trunk/validators/jboss/wsnative/src/main/java/org/jboss/savara/validator/
   trunk/validators/jboss/wsnative/src/main/java/org/jboss/savara/validator/jbosswsnative/
   trunk/validators/jboss/wsnative/src/main/java/org/jboss/savara/validator/jbosswsnative/service/
   trunk/validators/jboss/wsnative/src/main/java/org/jboss/savara/validator/jbosswsnative/service/JBossWSNativeServiceValidatorService.java
   trunk/validators/jboss/wsnative/src/main/java/org/jboss/savara/validator/jbosswsnative/service/JBossWSNativeServiceValidatorServiceMBean.java
   trunk/validators/jboss/wsnative/src/main/resources/
   trunk/validators/jboss/wsnative/src/test/
   trunk/validators/jboss/wsnative/src/test/java/
   trunk/validators/jboss/wsnative/src/test/resources/
Modified:
   trunk/distribution/pom.xml
   trunk/distribution/src/main/assembly/bin.xml
   trunk/distribution/src/main/release/install/build.xml
   trunk/validators/jboss/common/src/main/java/org/jboss/savara/validator/service/ServiceValidatorService.java
   trunk/validators/jboss/pom.xml
Log:
Added distribution of common sar, and skeleton of the JBossWS native service validator.

Modified: trunk/distribution/pom.xml
===================================================================
--- trunk/distribution/pom.xml	2010-09-02 08:11:37 UTC (rev 384)
+++ trunk/distribution/pom.xml	2010-09-02 14:08:59 UTC (rev 385)
@@ -40,11 +40,25 @@
     <dependencies>
         <dependency>
             <groupId>org.jboss.savara.validators</groupId>
+            <artifactId>savara-validator-jboss</artifactId>
+            <version>${pom.version}</version>
+            <classifier>dist</classifier>
+            <type>zip</type>
+        </dependency>
+        <dependency>
+            <groupId>org.jboss.savara.validators</groupId>
             <artifactId>savara-validator-jbossesb</artifactId>
             <version>${pom.version}</version>
             <classifier>dist</classifier>
             <type>zip</type>
         </dependency>
+        <dependency>
+            <groupId>org.jboss.savara.validators</groupId>
+            <artifactId>savara-validator-jbossws-native</artifactId>
+            <version>${pom.version}</version>
+            <classifier>dist</classifier>
+            <type>zip</type>
+        </dependency>
     </dependencies> 
 
     <build>

Modified: trunk/distribution/src/main/assembly/bin.xml
===================================================================
--- trunk/distribution/src/main/assembly/bin.xml	2010-09-02 08:11:37 UTC (rev 384)
+++ trunk/distribution/src/main/assembly/bin.xml	2010-09-02 14:08:59 UTC (rev 385)
@@ -95,7 +95,9 @@
             <outputDirectory>modules</outputDirectory>
 	    	<unpack>true</unpack>
             <includes>
+               <include>org.jboss.savara.validators:savara-validator-jboss:zip:dist</include>
                <include>org.jboss.savara.validators:savara-validator-jbossesb:zip:dist</include>
+               <include>org.jboss.savara.validators:savara-validator-jbossws-native:zip:dist</include>
             </includes>
         </dependencySet>
         

Modified: trunk/distribution/src/main/release/install/build.xml
===================================================================
--- trunk/distribution/src/main/release/install/build.xml	2010-09-02 08:11:37 UTC (rev 384)
+++ trunk/distribution/src/main/release/install/build.xml	2010-09-02 14:08:59 UTC (rev 385)
@@ -25,27 +25,35 @@
 		<fail unless="as.configured" message="Cannot determine target deployment, please check deployment.properties"/>
 	</target>
 
-    <target name="deploy" depends="check.deploy.props,register-validator-filter"
+    <target name="deploy" depends="check.deploy.props,register-validator-jbossesb-filter"
 						description="Deploys SAVARA Validator to the server">
-        <echo message="Deploy SAVARA Validator to JBoss AS/ESB server" />
+        <echo message="Deploy SAVARA Validators to JBossAS" />
+    	<copy todir="${deploy.dir}/savara-validator-jboss.sar">
+    		<fileset dir="${modules}/savara-validator-jboss.sar"/>
+    	</copy>
     	<copy todir="${deploy.dir}/savara-validator-jbossesb.esb">
     		<fileset dir="${modules}/savara-validator-jbossesb.esb"/>
     	</copy>
+    	<copy todir="${deploy.dir}/savara-validator-jbossws-native.sar">
+    		<fileset dir="${modules}/savara-validator-jbossws-native.sar"/>
+    	</copy>
     </target>
 
-    <target name="undeploy" depends="unregister-validator-filter" description="Undeploys SAVARA Validator">
-		<echo message="Undeploy the SAVARA Validator from JBoss AS/ESB server" />
+    <target name="undeploy" depends="unregister-validator-jbossesb-filter" description="Undeploys SAVARA Validator">
+		<echo message="Undeploy the SAVARA Validators from JBossAS" />
+        <delete dir="${deploy.dir}/savara-validator-jboss.sar" />
         <delete dir="${deploy.dir}/savara-validator-jbossesb.esb" />
+        <delete dir="${deploy.dir}/savara-validator-jbossws-native.sar" />
     </target>
 	
 
-    <target name="register-validator-filter">
+    <target name="register-validator-jbossesb-filter">
 		<echo message="register the validator filter in the jbossesb-properties file" />
         <delete file="${deployers.dir}/esb.deployer/jbossesb-properties.xml" />
 		<copy file="${modules}/conf/jbossesb-properties-validator.xml" tofile="${deployers.dir}/esb.deployer/jbossesb-properties.xml" />
     </target>
 
-    <target name="unregister-validator-filter">
+    <target name="unregister-validator-jbossesb-filter">
 		<echo message="unregister the validator filter from the jbossesb-properties file" />
         <delete file="${deployers.dir}/esb.deployer/jbossesb-properties.xml" />
 		<copy file="${modules}/conf/jbossesb-properties.xml" tofile="${deployers.dir}/esb.deployer/jbossesb-properties.xml" />

Modified: trunk/validators/jboss/common/src/main/java/org/jboss/savara/validator/service/ServiceValidatorService.java
===================================================================
--- trunk/validators/jboss/common/src/main/java/org/jboss/savara/validator/service/ServiceValidatorService.java	2010-09-02 08:11:37 UTC (rev 384)
+++ trunk/validators/jboss/common/src/main/java/org/jboss/savara/validator/service/ServiceValidatorService.java	2010-09-02 14:08:59 UTC (rev 385)
@@ -49,7 +49,7 @@
 	 * Service Validation Manager and registering it with JNDI.
 	 */
 	protected void startService() throws Exception {
-		logger.info("Starting JBoss Savara Service Validator Manager");
+		logger.info("Starting Savara Service Validator Manager");
 
 		m_serviceValidatorManager = new ServiceValidatorManager();
 
@@ -61,7 +61,7 @@
 	 * Service Validation Manager and unregistering it from JNDI.
 	 */
 	protected void stopService() throws Exception {
-		logger.info("Stopping JBoss Savara Service Validator Manager");
+		logger.info("Stopping Savara Service Validator Manager");
 
 		unbind(m_jndiName);
 

Modified: trunk/validators/jboss/pom.xml
===================================================================
--- trunk/validators/jboss/pom.xml	2010-09-02 08:11:37 UTC (rev 384)
+++ trunk/validators/jboss/pom.xml	2010-09-02 14:08:59 UTC (rev 385)
@@ -19,6 +19,7 @@
     <modules>
 		<module>common</module>
 		<module>esb</module>
+		<module>wsnative</module>
     </modules>
 
 </project>

Added: trunk/validators/jboss/wsnative/pom.xml
===================================================================
--- trunk/validators/jboss/wsnative/pom.xml	                        (rev 0)
+++ trunk/validators/jboss/wsnative/pom.xml	2010-09-02 14:08:59 UTC (rev 385)
@@ -0,0 +1,107 @@
+<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.savara.validators</groupId>
+	<artifactId>savara-validator-jbossws-native</artifactId>
+	<version>1.1.0-SNAPSHOT</version>
+	<packaging>jar</packaging>
+	<name>Savara::Validators::JBoss::WS-Native</name>
+	
+	<parent>
+		<groupId>org.jboss.savara.validators</groupId>
+		<artifactId>jboss</artifactId>
+		<version>1.1.0-SNAPSHOT</version>
+	</parent>
+
+		<dependencies>	
+			<dependency>
+				<groupId>org.jboss.savara.validators</groupId>
+				<artifactId>savara-validator-jboss</artifactId>
+	    		<version>${savara.version}</version>
+			</dependency>
+			<dependency>
+				<groupId>log4j</groupId>
+				<artifactId>log4j</artifactId>
+	    		<version>${log4j.version}</version>
+				<scope>provided</scope>
+			</dependency>
+		    <dependency>
+			  <groupId>org.jboss.jbossas</groupId>
+			  <artifactId>jboss-as-client</artifactId>
+		      <version>${jboss.version}</version>
+			  <type>pom</type>
+			  <scope>provided</scope>
+			</dependency>
+			<dependency>
+				<groupId>junit</groupId>
+				<artifactId>junit</artifactId>
+            	<version>${junit.version}</version>
+				<scope>test</scope>
+			</dependency>
+
+		</dependencies>
+	
+	<build>
+		<plugins>
+		  <plugin>
+	        <artifactId>maven-assembly-plugin</artifactId>
+	        <executions>
+	          <execution>
+	            <id>dist</id>
+	            <phase>package</phase>
+	            <goals>
+	              <goal>single</goal>
+	            </goals>
+	            <configuration>
+	              <finalName>savara-validator-jbossws-native.sar</finalName>
+	              <appendAssemblyId>true</appendAssemblyId>
+	              <descriptors>
+	                <descriptor>src/main/configs/ws-native-assembly.xml</descriptor>
+	              </descriptors>
+	            </configuration>
+	          </execution>
+	        </executions>
+	      </plugin>
+		  <plugin>
+			<artifactId>maven-javadoc-plugin</artifactId>
+			<executions>
+			  <execution>
+			    <id>generate-javadoc</id>
+			    <phase>package</phase>
+			    <goals>
+			      <goal>jar</goal>
+			    </goals>
+			  </execution>
+			</executions>
+			<configuration>
+			  <doclet>org.jboss.apiviz.APIviz</doclet>
+			  <docletArtifact>
+			    <groupId>org.jboss.apiviz</groupId>
+			    <artifactId>apiviz</artifactId>
+			    <version>1.2.4.GA</version>
+			  </docletArtifact>
+			  <aggregate>true</aggregate>
+			  <attach>false</attach>
+			  <additionalparam>
+			    -d ${project.build.directory}/javadoc
+			    -charset UTF-8
+			    -docencoding UTF-8
+			    -version
+			    -author
+			    -breakiterator
+			    -windowtitle "${project.name} ${project.version} API Reference"
+			    -doctitle "${project.name} ${project.version} API Reference"
+			    -bottom "Copyright © ${project.inceptionYear}-Present ${project.organization.name}. All Rights Reserved."
+			    -link http://java.sun.com/javase/6/docs/api/
+			    -sourceclasspath ${project.build.outputDirectory}
+			  </additionalparam>
+			  <encoding>UTF-8</encoding>
+			  <locale>en_US</locale>
+			</configuration>
+		   </plugin>
+	    </plugins>
+	</build>
+	
+</project>
+

Added: trunk/validators/jboss/wsnative/src/main/configs/META-INF/jboss-beans.xml
===================================================================
--- trunk/validators/jboss/wsnative/src/main/configs/META-INF/jboss-beans.xml	                        (rev 0)
+++ trunk/validators/jboss/wsnative/src/main/configs/META-INF/jboss-beans.xml	2010-09-02 14:08:59 UTC (rev 385)
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<deployment xmlns="urn:jboss:bean-deployer:2.0">
+
+  <bean class="org.jboss.savara.validator.jbosswsnative.service.JBossWSNativeServiceValidatorService"
+        				name="JBossWSNativeServiceValidator">
+    <!--
+    <annotation>@org.jboss.aop.microcontainer.aspects.jmx.JMX(name="jboss.savara:service=ServiceValidatorManager", exposedInterface=org.jboss.savara.validator.service.ServiceValidatorServiceMBean.class,registerDirectly=true)</annotation>
+    -->
+    <depends>jboss.savara:service=ServiceValidatorManager</depends>
+  </bean>
+
+</deployment>

Added: trunk/validators/jboss/wsnative/src/main/configs/META-INF/jboss-scanning.xml
===================================================================
--- trunk/validators/jboss/wsnative/src/main/configs/META-INF/jboss-scanning.xml	                        (rev 0)
+++ trunk/validators/jboss/wsnative/src/main/configs/META-INF/jboss-scanning.xml	2010-09-02 14:08:59 UTC (rev 385)
@@ -0,0 +1,3 @@
+<scanning xmlns="urn:jboss:scanning:1.0">
+	<!-- prevent scanning for annotations -->
+</scanning>

Added: trunk/validators/jboss/wsnative/src/main/configs/META-INF/jboss-structure.xml
===================================================================
--- trunk/validators/jboss/wsnative/src/main/configs/META-INF/jboss-structure.xml	                        (rev 0)
+++ trunk/validators/jboss/wsnative/src/main/configs/META-INF/jboss-structure.xml	2010-09-02 14:08:59 UTC (rev 385)
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<structure>
+    <context>
+        <path name=""/>
+        <metaDataPath>
+            <path name="META-INF"/>
+        </metaDataPath>        
+        <classpath>
+            <path name=""/>
+            <path name="" suffixes=".jar" />
+            <path name="lib" suffixes=".jar" />
+        </classpath>
+    </context>
+</structure>

Added: trunk/validators/jboss/wsnative/src/main/configs/ws-native-assembly.xml
===================================================================
--- trunk/validators/jboss/wsnative/src/main/configs/ws-native-assembly.xml	                        (rev 0)
+++ trunk/validators/jboss/wsnative/src/main/configs/ws-native-assembly.xml	2010-09-02 14:08:59 UTC (rev 385)
@@ -0,0 +1,27 @@
+<assembly 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/xsd/assembly-1.1.0-SNAPSHOT.xsd">
+  <id>dist</id>
+  <formats>
+    <format>zip</format>
+  </formats>
+  <includeBaseDirectory>true</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>src/main/configs</directory>
+      <outputDirectory>/</outputDirectory>
+      <excludes>
+        <exclude>ws-native-assembly.xml</exclude>
+      </excludes>
+    </fileSet>
+  </fileSets>
+  
+     <dependencySets>
+        <dependencySet>
+            <outputDirectory>/lib</outputDirectory>
+            <includes>
+               <include>org.jboss.savara.validators:savara-validator-jbossws-native</include>
+            </includes>
+        </dependencySet>
+    </dependencySets>
+  
+</assembly>

Added: trunk/validators/jboss/wsnative/src/main/java/org/jboss/savara/validator/jbosswsnative/service/JBossWSNativeServiceValidatorService.java
===================================================================
--- trunk/validators/jboss/wsnative/src/main/java/org/jboss/savara/validator/jbosswsnative/service/JBossWSNativeServiceValidatorService.java	                        (rev 0)
+++ trunk/validators/jboss/wsnative/src/main/java/org/jboss/savara/validator/jbosswsnative/service/JBossWSNativeServiceValidatorService.java	2010-09-02 14:08:59 UTC (rev 385)
@@ -0,0 +1,56 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ */
+package org.jboss.savara.validator.jbosswsnative.service;
+
+import java.util.logging.Logger;
+
+import javax.naming.*;
+
+/**
+ * This is the JBossWS Native Savara Service Validator Service managing the Service Validator.
+ *
+ * @author gbrown
+ *
+ */
+public class JBossWSNativeServiceValidatorService extends org.jboss.system.ServiceMBeanSupport implements JBossWSNativeServiceValidatorServiceMBean {
+
+	private final static Logger logger = Logger.getLogger(JBossWSNativeServiceValidatorService.class.getName());
+
+	/**
+	 * The default constructor.
+	 */
+	public JBossWSNativeServiceValidatorService() {
+	}
+
+	/**
+	 * This method starts the service, instantiating the
+	 * Service Validation Manager and registering it with JNDI.
+	 */
+	protected void startService() throws Exception {
+		logger.info("Starting Savara JBossWS Native Service Validator Adapter");
+	}
+
+	/**
+	 * This method stops the service, closing the
+	 * Service Validation Manager and unregistering it from JNDI.
+	 */
+	protected void stopService() throws Exception {
+		logger.info("Stopping Savara JBossWS Native Service Validator Adapter");
+	}
+
+}

Added: trunk/validators/jboss/wsnative/src/main/java/org/jboss/savara/validator/jbosswsnative/service/JBossWSNativeServiceValidatorServiceMBean.java
===================================================================
--- trunk/validators/jboss/wsnative/src/main/java/org/jboss/savara/validator/jbosswsnative/service/JBossWSNativeServiceValidatorServiceMBean.java	                        (rev 0)
+++ trunk/validators/jboss/wsnative/src/main/java/org/jboss/savara/validator/jbosswsnative/service/JBossWSNativeServiceValidatorServiceMBean.java	2010-09-02 14:08:59 UTC (rev 385)
@@ -0,0 +1,32 @@
+/*
+ * JBoss, Home of Professional Open Source
+ * Copyright 2009, Red Hat Middleware LLC, and others contributors as indicated
+ * by the @authors tag. All rights reserved.
+ * See the copyright.txt in the distribution for a
+ * full listing of individual contributors.
+ * This copyrighted material is made available to anyone wishing to use,
+ * modify, copy, or redistribute it subject to the terms and conditions
+ * of the GNU Lesser General Public License, v. 2.1.
+ * This program is distributed in the hope that it will be useful, but WITHOUT A
+ * WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
+ * PARTICULAR PURPOSE.  See the GNU Lesser General Public License for more details.
+ * You should have received a copy of the GNU Lesser General Public License,
+ * v.2.1 along with this distribution; if not, write to the Free Software
+ * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston,
+ * MA  02110-1301, USA.
+ */
+package org.jboss.savara.validator.jbosswsnative.service;
+
+import javax.naming.NamingException;
+
+import org.jboss.system.ServiceMBean;
+
+/**
+ * The MBean for the JBossWS Native Service Validator Service.
+ * 
+ * @author gbrown
+ *
+ */
+public interface JBossWSNativeServiceValidatorServiceMBean extends ServiceMBean {
+	
+}



More information about the savara-commits mailing list