[jboss-cvs] JBossAS SVN: r66769 - in projects/microcontainer/trunk/docs/examples/User_Guide: auditAspect and 14 other directories.

jboss-cvs-commits at lists.jboss.org jboss-cvs-commits at lists.jboss.org
Tue Nov 6 08:25:19 EST 2007


Author: newtonm
Date: 2007-11-06 08:25:19 -0500 (Tue, 06 Nov 2007)
New Revision: 66769

Added:
   projects/microcontainer/trunk/docs/examples/User_Guide/auditAspect/
   projects/microcontainer/trunk/docs/examples/User_Guide/auditAspect/pom.xml
   projects/microcontainer/trunk/docs/examples/User_Guide/auditAspect/src/
   projects/microcontainer/trunk/docs/examples/User_Guide/auditAspect/src/main/
   projects/microcontainer/trunk/docs/examples/User_Guide/auditAspect/src/main/java/
   projects/microcontainer/trunk/docs/examples/User_Guide/auditAspect/src/main/java/org/
   projects/microcontainer/trunk/docs/examples/User_Guide/auditAspect/src/main/java/org/jboss/
   projects/microcontainer/trunk/docs/examples/User_Guide/auditAspect/src/main/java/org/jboss/example/
   projects/microcontainer/trunk/docs/examples/User_Guide/auditAspect/src/main/java/org/jboss/example/aspect/
   projects/microcontainer/trunk/docs/examples/User_Guide/auditAspect/src/main/java/org/jboss/example/aspect/AuditAspect.java
   projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/assembly/withAOP.xml
   projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/config/
   projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/config/withAOP-beans.xml
   projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/config/withoutAOP-beans.xml
   projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/test/resources/service-beans.xml
Modified:
   projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/pom.xml
   projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/assembly/dist.xml
   projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/java/org/jboss/example/client/Client.java
   projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/pom.xml
Log:
Refactored client assemblies.

Added: projects/microcontainer/trunk/docs/examples/User_Guide/auditAspect/pom.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/auditAspect/pom.xml	                        (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/auditAspect/pom.xml	2007-11-06 13:25:19 UTC (rev 66769)
@@ -0,0 +1,43 @@
+<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>auditAspect</artifactId>
+  <packaging>jar</packaging>
+  <version>1.0.0</version>
+  <name>Audit Aspect</name>
+  <description>An auditing aspect that keeps a log of actions performed.</description>
+
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.aop</groupId>
+      <artifactId>jboss-aop</artifactId>
+      <version>2.0.0-SNAPSHOT</version>
+      <scope>compile</scope>
+    </dependency>
+  </dependencies>
+    
+  <build>
+    <plugins> 
+      <plugin>
+        <artifactId>maven-compiler-plugin</artifactId>
+        <configuration>
+          <source>1.5</source>
+          <target>1.5</target>
+          <debug>true</debug>
+          <showDeprecation>true</showDeprecation>
+          <showWarnings>true</showWarnings>
+          <optimize>true</optimize>
+        </configuration>
+      </plugin>  
+    </plugins>
+  </build>
+
+</project>

Added: projects/microcontainer/trunk/docs/examples/User_Guide/auditAspect/src/main/java/org/jboss/example/aspect/AuditAspect.java
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/auditAspect/src/main/java/org/jboss/example/aspect/AuditAspect.java	                        (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/auditAspect/src/main/java/org/jboss/example/aspect/AuditAspect.java	2007-11-06 13:25:19 UTC (rev 66769)
@@ -0,0 +1,11 @@
+package org.jboss.example.aspect;
+
+import org.jboss.aop.joinpoint.Invocation;
+
+public class AuditAspect {
+
+	public Object audit(Invocation inv) throws Throwable {
+		System.out.println("Audit Aspect !!!");
+		return inv.invokeNext();
+	}
+}

Modified: projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/pom.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/pom.xml	2007-11-06 13:23:33 UTC (rev 66768)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/pom.xml	2007-11-06 13:25:19 UTC (rev 66769)
@@ -28,6 +28,18 @@
       <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>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.microcontainer.examples</groupId>
+      <artifactId>auditAspect</artifactId>
+      <version>1.0.0</version>
+      <scope>runtime</scope>
+    </dependency>
   </dependencies>
     
   <build>
@@ -44,7 +56,7 @@
               <classpathPrefix>lib</classpathPrefix>  
             </manifest>
             <manifestEntries>
-              <Class-Path>. ./deploy/humanResourcesService-1.0.0.jar ./deploy/humanResourcesService-1.0.0.jar/ lib/jboss-common-logging-log4j-2.0.4.GA.jar lib/log4j-1.2.14.jar</Class-Path>
+              <Class-Path>. humanResourcesService-1.0.0.jar auditAspect-1.0.0.jar</Class-Path>
             </manifestEntries>
           </archive>
         </configuration>
@@ -54,6 +66,7 @@
         <configuration>
           <descriptors>
             <descriptor>src/main/assembly/dist.xml</descriptor>
+            <descriptor>src/main/assembly/withAOP.xml</descriptor>
           </descriptors>
         </configuration>
       </plugin>	 

Modified: projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/assembly/dist.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/assembly/dist.xml	2007-11-06 13:23:33 UTC (rev 66768)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/assembly/dist.xml	2007-11-06 13:25:19 UTC (rev 66769)
@@ -12,20 +12,31 @@
         <include>*.jar</include>
       </includes>
     </fileSet>
-    </fileSets>
+  </fileSets>
+  <files>
+    <file>
+      <source>src/main/config/withoutAOP-beans.xml</source>
+      <outputDirectory/>
+      <destName>service-beans.xml</destName>
+    </file>
+  </files>
 
   <dependencySets>
     <dependencySet>
       <outputDirectory>/lib</outputDirectory>
       <unpack>false</unpack>
-      <scope>compile</scope>
+      <scope>runtime</scope>
        <excludes>
         <exclude>org.jboss.microcontainer.examples:humanResourcesService</exclude>
+        <exclude>org.jboss:javassist</exclude>
+        <exclude>org.jboss.aop:jboss-aop</exclude>
+        <exclude>org.jboss.microcontainer:jboss-aop-mc-int</exclude>
+        <exclude>org.jboss.microcontainer.examples:auditAspect</exclude>
       </excludes>
     </dependencySet>
     <dependencySet>
-      <outputDirectory>/deploy</outputDirectory>
-      <unpack>true</unpack>
+      <outputDirectory/>
+      <unpack>false</unpack>
       <scope>runtime</scope>
       <includes>
         <include>org.jboss.microcontainer.examples:humanResourcesService</include>

Added: projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/assembly/withAOP.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/assembly/withAOP.xml	                        (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/assembly/withAOP.xml	2007-11-06 13:25:19 UTC (rev 66769)
@@ -0,0 +1,44 @@
+<assembly>
+  <id>withAOP</id>
+  <formats>
+    <format>dir</format>
+  </formats>
+  <includeBaseDirectory>false</includeBaseDirectory>
+  <fileSets>
+    <fileSet>
+      <directory>target</directory>
+      <outputDirectory/>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <files>
+    <file>
+      <source>src/main/config/withAOP-beans.xml</source>
+      <outputDirectory/>
+      <destName>service-beans.xml</destName>
+    </file>
+  </files>
+
+  <dependencySets>
+    <dependencySet>
+      <outputDirectory>/lib</outputDirectory>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+       <excludes>
+        <exclude>org.jboss.microcontainer.examples:humanResourcesService</exclude>
+        <exclude>org.jboss.microcontainer.examples:auditAspect</exclude>
+      </excludes>
+    </dependencySet>
+    <dependencySet>
+      <outputDirectory/>
+      <unpack>false</unpack>
+      <scope>runtime</scope>
+      <includes>
+        <include>org.jboss.microcontainer.examples:humanResourcesService</include>
+        <include>org.jboss.microcontainer.examples:auditAspect</include>
+      </includes>
+    </dependencySet>
+  </dependencySets>
+</assembly>

Added: projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/config/withAOP-beans.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/config/withAOP-beans.xml	                        (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/config/withAOP-beans.xml	2007-11-06 13:25:19 UTC (rev 66769)
@@ -0,0 +1,18 @@
+<?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->*(..))"/>
+     
+   <bean name="HRService" class="org.jboss.example.service.HRManager"/>
+   
+</deployment>
+

Added: projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/config/withoutAOP-beans.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/config/withoutAOP-beans.xml	                        (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/config/withoutAOP-beans.xml	2007-11-06 13:25:19 UTC (rev 66769)
@@ -0,0 +1,9 @@
+<?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"/>
+      
+</deployment>

Modified: projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/java/org/jboss/example/client/Client.java
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/java/org/jboss/example/client/Client.java	2007-11-06 13:23:33 UTC (rev 66768)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/main/java/org/jboss/example/client/Client.java	2007-11-06 13:25:19 UTC (rev 66769)
@@ -46,7 +46,7 @@
 		this.useBus = useBus;
 		
 		ClassLoader cl = Thread.currentThread().getContextClassLoader();
-		url = cl.getResource("META-INF/jboss-beans.xml");
+		url = cl.getResource("service-beans.xml");
 	
 		// Start JBoss Microcontainer
 		bootstrap = new EmbeddedBootstrap();

Added: projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/test/resources/service-beans.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/test/resources/service-beans.xml	                        (rev 0)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/commandLineClient/src/test/resources/service-beans.xml	2007-11-06 13:25:19 UTC (rev 66769)
@@ -0,0 +1,9 @@
+<?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"/>
+      
+</deployment>

Modified: projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/pom.xml
===================================================================
--- projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/pom.xml	2007-11-06 13:23:33 UTC (rev 66768)
+++ projects/microcontainer/trunk/docs/examples/User_Guide/humanResourcesService/pom.xml	2007-11-06 13:25:19 UTC (rev 66769)
@@ -11,6 +11,15 @@
 
 
   <build>
+    <resources>
+      <resource>
+        <directory>src/main/resources</directory>
+    	<excludes>
+    	  <exclude>META-INF/*</exclude>
+    	</excludes>
+      </resource>
+    </resources>
+    
     <plugins>
       <plugin>
         <artifactId>maven-compiler-plugin</artifactId>




More information about the jboss-cvs-commits mailing list