Changeset 632

Timestamp:

04/03/11 22:44:46 (2 years ago)

Author:

philsmart

Message:

 

Location:

raptor-mua/trunk

Files:

• .classpath (modified) (1 diff)
• .settings/org.eclipse.wst.common.component (modified) (1 diff)
• pom.xml (modified) (3 diffs)
• src/main/config (added)
• src/main/config/dao-beans.xml (added)
• src/main/config/event-release.xml (added)
• src/main/config/mua-core.xml (added)
• src/main/config/mua-registry.xml (added)
• src/main/config/statistical-units.xml (added)
• src/main/config/users.xml (added)
• src/main/config/web.xml (added)
• src/main/java/uk/ac/cardiff/raptormua/server (added)
• src/main/java/uk/ac/cardiff/raptormua/server/RunServer.java (added)
• src/main/resources/package.xml (added)
• src/test/java/uk/ac/cardiff/raptormua/engine/statistics/ReflectionHelperTest.java (modified) (1 diff)

raptor-mua/trunk/.classpath

@@ -3 +3 @@
         <classpathentry kind="src" output="target/classes" path="src/main/java"/>
         <classpathentry kind="src" output="target/classes" path="src/main/resources"/>
+        <classpathentry kind="src" output="target/conf" path="src/main/config"/>
         <classpathentry kind="src" path="src/test/java/"/>
         <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER">

raptor-mua/trunk/.settings/org.eclipse.wst.common.component

@@ -6 +6 @@
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/resources"/>
         <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/test/java"/>
+        <wb-resource deploy-path="/WEB-INF/classes" source-path="/src/main/config"/>
         <dependent-module deploy-path="/WEB-INF/lib" handle="module:/resource/raptor-client/raptor-client">
             <dependency-type>uses</dependency-type>

raptor-mua/trunk/pom.xml

@@ -33 +33 @@
                 <apache.cxf.version>2.2.7</apache.cxf.version>
                 <spring.version>3.0.2.RELEASE</spring.version>
+                <jetty.version>6.1.23</jetty.version>
                 <!--<spring.version>2.5.6</spring.version>-->
         </properties>
+        
 
         <dependencies>
+        
+                <!-- jetty runtime for standalone deployment -->
+
+                <dependency>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>jetty</artifactId>
+                        <version>${jetty.version}</version>
+                </dependency>
+                <dependency>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>start</artifactId>
+                        <version>${jetty.version}</version>
+                </dependency>
+                <dependency>
+                        <groupId>org.mortbay.jetty</groupId>
+                        <artifactId>jetty-util</artifactId>
+                        <version>${jetty.version}</version>
+                </dependency>
+        
                 <dependency>
                         <groupId>org.apache.cxf</groupId>
@@ -412 +433 @@
                 <plugins>
                         <plugin>
+                                <artifactId>maven-jar-plugin</artifactId>
+                                <configuration>
+                                        <archive>
+                                                <manifest>
+                                                        <mainClass>uk.ac.cardiff.raptormua.server.RunServer</mainClass>
+                                                        <addClasspath>true</addClasspath>
+                                                        <classpathPrefix>lib/</classpathPrefix>
+                                                </manifest>
+                                        </archive>
+                                </configuration>
+                        </plugin>
+                        <plugin>
                                 <artifactId>maven-release-plugin</artifactId>
                                 <version>2.0</version>
@@ -431 +464 @@
                                         </dependency>
                                 </dependencies>
+                        </plugin>
+                        <plugin>
+                                <artifactId>maven-assembly-plugin</artifactId>
+                                <executions>
+                                        <execution>
+                                                <id>assembly</id>
+                                                <phase>package</phase>
+                                                <goals>
+                                                        <goal>assembly</goal>
+                                                </goals>
+                                                <configuration>
+                                                        <descriptors>
+                                                                <descriptor>src/main/resources/package.xml</descriptor>
+                                                        </descriptors>
+                                                </configuration>
+                                        </execution>
+                                </executions>
                         </plugin>
                         <plugin>

raptor-mua/trunk/src/test/java/uk/ac/cardiff/raptormua/engine/statistics/ReflectionHelperTest.java

@@ -26 +26 @@
         @Test
         public void testFindClassForField(){            
-                        String classForField = ReflectionHelper.findEntrySubclassForMethod("principleName");
+                        String classForField = ReflectionHelper.findEntrySubclassForMethod("principalName");
                         System.out.println("ShibbolethEntry = "+classForField);
-                        equals(classForField.equals("ShibbolethEntry"));
+                        equals(classForField.equals("ShibbolethIdpAuthenticationEvent"));
                         
-                        classForField = ReflectionHelper.findEntrySubclassForMethod("requestHost");
-                        System.out.println("Entry = "+classForField);
-                        equals(classForField.equals("Entry"));
+                        classForField = ReflectionHelper.findEntrySubclassForMethod("serviceHost");
+                        System.out.println("Event = "+classForField);
+                        equals(classForField.equals("Event"));