geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From jlaskow...@apache.org
Subject svn commit: r386778 - in /geronimo/trunk: modules/jetty/pom.xml modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java pom.xml
Date Sat, 18 Mar 2006 01:03:14 GMT
Author: jlaskowski
Date: Fri Mar 17 17:03:13 2006
New Revision: 386778

URL: http://svn.apache.org/viewcvs?rev=386778&view=rev
Log:
GERONIMO-1731 - Module migration to Maven 2: jetty
Submitted by: Prasad Kashyap

Added:
    geronimo/trunk/modules/jetty/pom.xml   (with props)
Modified:
    geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
    geronimo/trunk/pom.xml

Added: geronimo/trunk/modules/jetty/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/pom.xml?rev=386778&view=auto
==============================================================================
--- geronimo/trunk/modules/jetty/pom.xml (added)
+++ geronimo/trunk/modules/jetty/pom.xml Fri Mar 17 17:03:13 2006
@@ -0,0 +1,102 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+
+    Copyright 2006 The Apache Software Foundation
+
+    Licensed 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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project>
+  <parent>
+    <groupId>org.apache.geronimo</groupId>
+    <artifactId>geronimo</artifactId>
+    <version>1.2-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>geronimo-jetty</artifactId>
+  <name>Geronimo :: Jetty</name>
+  <version>${geronimoVersion}</version>
+  <description>Geronimo Jetty Integration</description>
+
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-surefire-plugin</artifactId>
+        <configuration>
+          <systemProperties>
+            <user.dir>${basedir}</user.dir>
+            <java.security.auth.login.config>src/test-data/data/login.config</java.security.auth.login.config>
+          </systemProperties>
+          <forkMode>once</forkMode>
+          <workingDirectory>${basedir}</workingDirectory>
+          <argLine>-enableassertions</argLine>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.geronimo</groupId>
+      <artifactId>geronimo-security-builder</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo</groupId>
+      <artifactId>geronimo-connector</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.geronimo</groupId>
+      <artifactId>geronimo-webservices</artifactId>
+    </dependency>
+    <dependency>
+      <groupId>jetty</groupId>
+      <artifactId>org.mortbay.jetty</artifactId>
+      <version>${jettyVersion}</version>
+    </dependency>
+
+    <!-- these are needed only for the generated geronimo-service.xml file -->
+    <!-- dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-compiler</artifactId>
+      <version>${tomcatVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-compiler-jdt</artifactId>
+      <version>${tomcatVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>tomcat</groupId>
+      <artifactId>jasper-runtime</artifactId>
+      <version>${tomcatVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-el</groupId>
+      <artifactId>commons-el</artifactId>
+      <version>${commonsElVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-collections</groupId>
+      <artifactId>commons-collections</artifactId>
+      <version>${commonsCollectionsVersion}</version>
+    </dependency>
+    <dependency>
+      <groupId>commons-primitives</groupId>
+      <artifactId>commons-primitives</artifactId>
+      <version>${commonsPrimitivesVersion}</version>
+    </dependency -->
+
+  </dependencies>
+</project>

Propchange: geronimo/trunk/modules/jetty/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/trunk/modules/jetty/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Rev Date

Propchange: geronimo/trunk/modules/jetty/pom.xml
------------------------------------------------------------------------------
    svn:mime-type = text/xml

Modified: geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
URL: http://svn.apache.org/viewcvs/geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java?rev=386778&r1=386777&r2=386778&view=diff
==============================================================================
--- geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
(original)
+++ geronimo/trunk/modules/jetty/src/test/org/apache/geronimo/jetty/AbstractWebModuleTest.java
Fri Mar 17 17:03:13 2006
@@ -1,4 +1,5 @@
 /**
+ * 
  *
  * Copyright 2003-2004 The Apache Software Foundation
  *
@@ -87,6 +88,7 @@
     private ObjectName serverInfoName;
     private GBeanData serverInfoGBean;
     protected final static String securityRealmName = "demo-properties-realm";
+    private String basedir = System.getProperty("basedir", System.getProperty("user.dir"));
 
     public void testDummy() throws Exception {
     }
@@ -178,7 +180,6 @@
     }
 
     protected void setUpSecurity() throws Exception {
-
         loginConfigurationName = new ObjectName("geronimo.security:type=LoginConfiguration");
         loginConfigurationGBean = new GBeanData(loginConfigurationName, GeronimoLoginConfiguration.getGBeanInfo());
         Set configurations = new HashSet();
@@ -188,7 +189,7 @@
 
         serverInfoName = new ObjectName("geronimo.system:name=ServerInfo");
         serverInfoGBean = new GBeanData(serverInfoName, BasicServerInfo.GBEAN_INFO);
-        serverInfoGBean.setAttribute("baseDirectory", ".");
+        serverInfoGBean.setAttribute("baseDirectory", basedir);
 
         securityServiceName = new ObjectName("geronimo.server:j2eeType=SecurityService");
         securityServiceGBean = new GBeanData(securityServiceName, SecurityServiceImpl.GBEAN_INFO);
@@ -308,4 +309,5 @@
         stop(containerName);
         kernel.shutdown();
     }
+
 }

Modified: geronimo/trunk/pom.xml
URL: http://svn.apache.org/viewcvs/geronimo/trunk/pom.xml?rev=386778&r1=386777&r2=386778&view=diff
==============================================================================
--- geronimo/trunk/pom.xml (original)
+++ geronimo/trunk/pom.xml Fri Mar 17 17:03:13 2006
@@ -163,7 +163,7 @@
     <javaccVersion>2.1</javaccVersion>
     <jdbmVersion>0.20-dev</jdbmVersion>
     <jdomVersion>1.0</jdomVersion>
-    <jettyVersion>5.1.5rc2</jettyVersion>
+    <jettyVersion>5.1.10</jettyVersion>
     <jstlVersion>1.1.1</jstlVersion>
     <juddiVersion>0.9rc4</juddiVersion>
     <junitVersion>3.8.1</junitVersion>
@@ -776,6 +776,7 @@
         <module>modules/j2ee</module>
         <module>modules/j2ee-builder</module>
         <module>modules/j2ee-schema</module>
+        <module>modules/jetty</module>
         <module>modules/javamail-transport</module>
         <module>modules/jmx-remoting</module>
         <module>modules/kernel</module>



Mime
View raw message