[jboss-cvs] JBossAS SVN: r66816 - in projects/microcontainer/trunk/docs/examples/User_Guide: commandLineClient and 12 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Wed Nov 7 06:31:29 EST 2007


Author: newtonm
Date: 2007-11-07 06:31:29 -0500 (Wed, 07 Nov 2007)
New Revision: 66816

Added:
   projects/microcontainer/trunk/docs/examples/User_Guide/distributions/
   projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/
   projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/pom.xml
   projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/src/
   projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/src/main/
   projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/src/main/assembly/
   projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/src/main/assembly/dist.xml
   projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/src/main/config/
   projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/src/main/config/run.sh
   projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/src/main/config/service-beans.xml
   projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/
   projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/pom.xml
   projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/src/
   projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/src/main/
   projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/src/main/assembly/
   projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/src/main/assembly/dist.xml
   projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/src/main/config/
   projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/src/main/config/run.sh
   projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/src/main/config/service-beans.xml
   projects/microcontainer/trunk/docs/examples/User_Guide/distributions/pom.xml
Removed:
   projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/assembly/
   projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/config/
Modified:
   projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/pom.xml
Log:
Refactored assemblies to separate distributions project.

Modified: projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/pom.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/pom.xml	2007-11-07 11:26:57 UTC (rev 66815)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/pom.xml	2007-11-07 11:31:29 UTC (rev 66816)
@@ -17,29 +17,17 @@
       <scope>compile</scope>      
     </dependency>
     <dependency>
-      <groupId>junit</groupId>
-      <artifactId>junit</artifactId>
-      <version>3.8.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.jboss.microcontainer.examples</groupId>
       <artifactId>humanResourcesService</artifactId>
       <version>1.0.0</version>
       <scope>compile</scope>
     </dependency>
     <dependency>
-      <groupId>org.jboss.microcontainer</groupId>
-      <artifactId>jboss-aop-mc-int</artifactId>
-      <version>2.0.0-SNAPSHOT</version>
-      <scope>runtime</scope>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
     </dependency>
-    <dependency>
-      <groupId>org.jboss.microcontainer.examples</groupId>
-      <artifactId>auditAspect</artifactId>
-      <version>1.0.0</version>
-      <scope>runtime</scope>
-    </dependency>
   </dependencies>
     
   <build>
@@ -61,26 +49,9 @@
         <configuration>
           <archive>
             <addMavenDescriptor>false</addMavenDescriptor>
-            <manifest>
-              <mainClass>org.jboss.example.client.Client</mainClass>
-              <addClasspath>true</addClasspath>
-              <classpathPrefix>lib</classpathPrefix>  
-            </manifest>
-            <manifestEntries>
-              <Class-Path>. humanResourcesService-1.0.0.jar auditAspect-1.0.0.jar</Class-Path>
-            </manifestEntries>
           </archive>
         </configuration>
       </plugin>
-      <plugin>
-        <artifactId>maven-assembly-plugin</artifactId>
-        <configuration>
-          <descriptors>
-            <descriptor>src/main/assembly/withoutAOP.xml</descriptor>
-            <descriptor>src/main/assembly/withAOP.xml</descriptor>
-          </descriptors>
-        </configuration>
-      </plugin> 
     </plugins>
   </build>
 

Added: projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/pom.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/pom.xml	                        (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/pom.xml	2007-11-07 11:31:29 UTC (rev 66816)
@@ -0,0 +1,31 @@
+<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">
+
+  <parent>
+    <groupId>org.jboss.microcontainer.examples</groupId>
+    <artifactId>distributions</artifactId>
+    <version>1.0.0</version>
+  </parent>
+  
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.jboss.microcontainer.examples</groupId>
+  <artifactId>clientDist</artifactId>
+  <packaging>pom</packaging>
+  <version>1.0.0</version>
+  <name>Client Distribution</name>
+  <description>A simple command line client that uses the Human Resources Service.</description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/dist.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin> 
+    </plugins>
+  </build>
+
+</project>

Added: projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/src/main/assembly/dist.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/src/main/assembly/dist.xml	                        (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/src/main/assembly/dist.xml	2007-11-07 11:31:29 UTC (rev 66816)
@@ -0,0 +1,34 @@
+<assembly>
+  <id>dist</id>
+  <formats>
+    <format>dir</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <files>
+    <file>
+      <source>src/main/config/service-beans.xml</source>
+    </file>
+    <file>
+      <source>src/main/config/run.sh</source>
+      <fileMode>0744</fileMode>
+    </file>
+  </files>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/lib</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+       <excludes>
+        <exclude>org.jboss.microcontainer.examples:client</exclude>
+      </excludes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory/>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+      <includes>
+        <include>org.jboss.microcontainer.examples:client</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+</assembly>

Added: projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/src/main/config/run.sh
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/src/main/config/run.sh	                        (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/src/main/config/run.sh	2007-11-07 11:31:29 UTC (rev 66816)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+java -Djava.ext.dirs=`pwd`/lib -cp .:client-1.0.0.jar org.jboss.example.client.Client


Property changes on: projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/src/main/config/run.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/src/main/config/service-beans.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/src/main/config/service-beans.xml	                        (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/distributions/client/src/main/config/service-beans.xml	2007-11-07 11:31:29 UTC (rev 66816)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
+            xmlns="urn:jboss:bean-deployer:2.0">
+
+   <bean name="HRService" class="org.jboss.example.service.HRManager">
+     <!-- <property name="hiringFreeze">true</property>    
+     <property name="salaryStrategy"><inject bean="AgeBasedSalary"/></property> -->
+   </bean>
+      
+   <!-- <bean name="AgeBasedSalary" class="org.jboss.example.service.util.AgeBasedSalaryStrategy">
+     <property name="minSalary">1000</property>
+     <property name="maxSalary">80000</property>
+   </bean>
+   
+   <bean name="LocationBasedSalary" class="org.jboss.example.service.util.LocationBasedSalaryStrategy">
+     <property name="minSalary">2000</property>
+     <property name="maxSalary">90000</property>
+   </bean> -->
+         
+</deployment>

Added: projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/pom.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/pom.xml	                        (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/pom.xml	2007-11-07 11:31:29 UTC (rev 66816)
@@ -0,0 +1,52 @@
+<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">
+
+  <parent>
+    <groupId>org.jboss.microcontainer.examples</groupId>
+    <artifactId>distributions</artifactId>
+    <version>1.0.0</version>
+  </parent>
+  
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.jboss.microcontainer.examples</groupId>
+  <artifactId>clientAOPDist</artifactId>
+  <packaging>pom</packaging>
+  <version>1.0.0</version>
+  <name>Client Distribution with AOP</name>
+  <description>A simple command line client that uses the Human Resources Service together with AOP.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.jboss.aop</groupId>
+      <artifactId>jboss-aop</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.microcontainer</groupId>
+      <artifactId>jboss-aop-mc-int</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.microcontainer.examples</groupId>
+      <artifactId>auditAspect</artifactId>
+      <version>1.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+  
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-assembly-plugin</artifactId>
+        <configuration>
+          <descriptors>
+            <descriptor>src/main/assembly/dist.xml</descriptor>
+          </descriptors>
+        </configuration>
+      </plugin> 
+    </plugins>
+  </build>
+
+</project>

Added: projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/src/main/assembly/dist.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/src/main/assembly/dist.xml	                        (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/src/main/assembly/dist.xml	2007-11-07 11:31:29 UTC (rev 66816)
@@ -0,0 +1,34 @@
+<assembly>
+  <id>dist</id>
+  <formats>
+    <format>dir</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <files>
+    <file>
+      <source>src/main/config/service-beans.xml</source>
+    </file>
+    <file>
+      <source>src/main/config/run.sh</source>
+      <fileMode>0744</fileMode>
+    </file>
+  </files>
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/lib</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+       <excludes>
+        <exclude>org.jboss.microcontainer.examples:client</exclude>
+      </excludes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory/>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+      <includes>
+        <include>org.jboss.microcontainer.examples:client</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+</assembly>

Added: projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/src/main/config/run.sh
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/src/main/config/run.sh	                        (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/src/main/config/run.sh	2007-11-07 11:31:29 UTC (rev 66816)
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+java -Djava.ext.dirs=`pwd`/lib -cp .:client-1.0.0.jar org.jboss.example.client.Client


Property changes on: projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/src/main/config/run.sh
___________________________________________________________________
Name: svn:executable
   + *

Added: projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/src/main/config/service-beans.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/src/main/config/service-beans.xml	                        (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/distributions/clientAOP/src/main/config/service-beans.xml	2007-11-07 11:31:29 UTC (rev 66816)
@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+ 
+<deployment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+            xsi:schemaLocation="urn:jboss:bean-deployer:2.0 bean-deployer_2_0.xsd"
+            xmlns="urn:jboss:bean-deployer:2.0">
+   
+   <bean name="AspectManager" class="org.jboss.aop.AspectManager">
+     <constructor factoryClass="org.jboss.aop.AspectManager" factoryMethod="instance"/>
+   </bean>
+   
+   <aop:aspect xmlns:aop="urn:jboss:aop-beans:1.0"
+               name="AuditAspect" class="org.jboss.example.aspect.AuditAspect"
+               method="audit" pointcut="execution(public * org.jboss.example.service.HRManager->*(..))">
+   </aop:aspect>
+     
+   <bean name="HRService" class="org.jboss.example.service.HRManager">
+     <!-- <property name="hiringFreeze">true</property>    
+     <property name="salaryStrategy"><inject bean="AgeBasedSalary"/></property> -->
+   </bean>
+   
+   <!-- <bean name="AgeBasedSalary" class="org.jboss.example.service.util.AgeBasedSalaryStrategy">
+     <property name="minSalary">1000</property>
+     <property name="maxSalary">80000</property>
+   </bean>
+   
+   <bean name="LocationBasedSalary" class="org.jboss.example.service.util.LocationBasedSalaryStrategy">
+     <property name="minSalary">2000</property>
+     <property name="maxSalary">90000</property>
+   </bean> -->
+   
+</deployment>
+

Added: projects/microcontainer/trunk/docs/examples/User_Guide/distributions/pom.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/distributions/pom.xml	                        (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/distributions/pom.xml	2007-11-07 11:31:29 UTC (rev 66816)
@@ -0,0 +1,33 @@
+<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.microcontainer.examples</groupId>
+  <artifactId>distributions</artifactId>
+  <packaging>pom</packaging>
+  <version>1.0.0</version>
+  <name>Distributions</name>
+  <description>Common dependencies for the getting started distributions.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.jboss.microcontainer</groupId>
+      <artifactId>jboss-kernel</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+      <scope>runtime</scope>      
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.microcontainer.examples</groupId>
+      <artifactId>humanResourcesService</artifactId>
+      <version>1.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.microcontainer.examples</groupId>
+      <artifactId>client</artifactId>
+      <version>1.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
+  </dependencies>
+
+</project>




More information about the jboss-cvs-commits mailing list