geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r611389 - in /geronimo/sandbox/jetspeed-integration: ./ jetspeed-base/ jetspeed-database/ jetspeed-derby-database/src/main/plan/ jetspeed-geronimo/ jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/ jetspeed-tomcat-as...
Date Sat, 12 Jan 2008 08:50:09 GMT
Author: djencks
Date: Sat Jan 12 00:50:08 2008
New Revision: 611389

URL: http://svn.apache.org/viewvc?rev=611389&view=rev
Log:
Use released jetspeed 2.1.3.  Use the derby datasource in the JetspeedSerializerGBean.  Add
a simple tomcat assembly including jetspeed

Added:
    geronimo/sandbox/jetspeed-integration/jetspeed-tomcat-assembly/
      - copied from r611336, geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/
Modified:
    geronimo/sandbox/jetspeed-integration/jetspeed-base/pom.xml
    geronimo/sandbox/jetspeed-integration/jetspeed-database/pom.xml
    geronimo/sandbox/jetspeed-integration/jetspeed-derby-database/src/main/plan/plan.xml
    geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/pom.xml
    geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java
    geronimo/sandbox/jetspeed-integration/jetspeed-tomcat-assembly/pom.xml
    geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/pom.xml
    geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/boot/geronimo-datasource.xml
    geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/plan/plan.xml
    geronimo/sandbox/jetspeed-integration/pom.xml

Modified: geronimo/sandbox/jetspeed-integration/jetspeed-base/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-base/pom.xml?rev=611389&r1=611388&r2=611389&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-base/pom.xml (original)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-base/pom.xml Sat Jan 12 00:50:08 2008
@@ -30,7 +30,7 @@
        This configuration carries Jetspeed's common jars that are shared by all its portlet
apps.
     </description>
     <properties>
-        <jetspeedVersion>2.1.3-dev</jetspeedVersion>
+        <jetspeedVersion>2.1.3</jetspeedVersion>
     </properties>
     
     <dependencies>

Modified: geronimo/sandbox/jetspeed-integration/jetspeed-database/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-database/pom.xml?rev=611389&r1=611388&r2=611389&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-database/pom.xml (original)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-database/pom.xml Sat Jan 12 00:50:08 2008
@@ -37,7 +37,7 @@
      </description> 
 
      <properties>
-       <jetspeedVersion>2.1.3-dev</jetspeedVersion>
+       <jetspeedVersion>2.1.3</jetspeedVersion>
      </properties>
 
     <build>

Modified: geronimo/sandbox/jetspeed-integration/jetspeed-derby-database/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-derby-database/src/main/plan/plan.xml?rev=611389&r1=611388&r2=611389&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-derby-database/src/main/plan/plan.xml (original)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-derby-database/src/main/plan/plan.xml Sat
Jan 12 00:50:08 2008
@@ -23,7 +23,7 @@
             <connection-definition>
                 <connectionfactory-interface>javax.sql.DataSource</connectionfactory-interface>
                 <connectiondefinition-instance>
-                    <name>JetspeedDS</name>
+                    <name>jdbc/jetspeed</name>
                     <config-property-setting name="UserName"></config-property-setting>
                     <config-property-setting name="Password"></config-property-setting>
                     <config-property-setting name="DatabaseName">JetspeedDB</config-property-setting>
@@ -44,7 +44,7 @@
       <attribute name="testSQL">SELECT t.tablename FROM SYS.SYSTABLES t WHERE t.tablename='MEDIA_TYPE'
</attribute>
       <attribute name="path">META-INF/database/derby/phase1-schema.sql</attribute>
       <reference name="DataSource">
-            <name>JetspeedDS</name>
+            <name>jdbc/jetspeed</name>
         </reference>
     </gbean>
 
@@ -52,7 +52,7 @@
       <attribute name="testSQL">SELECT t.tablename FROM SYS.SYSTABLES t WHERE t.tablename='FOLDER'
</attribute>
       <attribute name="path">META-INF/database/derby/phase2-schema.sql</attribute>
       <reference name="DataSource">
-            <name>JetspeedDS</name>
+            <name>jdbc/jetspeed</name>
         </reference>
     </gbean>
 
@@ -60,7 +60,7 @@
       <attribute name="testSQL">SELECT t.tablename FROM SYS.SYSTABLES t WHERE t.tablename='OJB_HL_SEQ'
</attribute>
       <attribute name="path">META-INF/database/derby/phase3ojb-schema.sql</attribute>
       <reference name="DataSource">
-            <name>JetspeedDS</name>
+            <name>jdbc/jetspeed</name>
         </reference>
     </gbean>
 
@@ -68,7 +68,7 @@
       <attribute name="testSQL">SELECT t.tablename FROM SYS.SYSTABLES t WHERE t.tablename='PREFS_NODE'
</attribute>
       <attribute name="path">META-INF/database/derby/prefs-schema.sql</attribute>
       <reference name="DataSource">
-            <name>JetspeedDS</name>
+            <name>jdbc/jetspeed</name>
         </reference>
     </gbean>
 
@@ -76,7 +76,7 @@
       <attribute name="testSQL">SELECT t.tablename FROM SYS.SYSTABLES t WHERE t.tablename='PORTLET_DEFINITION'
</attribute>
       <attribute name="path">META-INF/database/derby/registry-schema.sql</attribute>
       <reference name="DataSource">
-            <name>JetspeedDS</name>
+            <name>jdbc/jetspeed</name>
         </reference>
     </gbean>
 
@@ -84,7 +84,7 @@
       <attribute name="testSQL">SELECT t.tablename FROM SYS.SYSTABLES t WHERE t.tablename='SECURITY_PRINCIPAL'
</attribute>
       <attribute name="path">META-INF/database/derby/security-schema.sql</attribute>
       <reference name="DataSource">
-            <name>JetspeedDS</name>
+            <name>jdbc/jetspeed</name>
         </reference>
     </gbean>
 

Modified: geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/pom.xml?rev=611389&r1=611388&r2=611389&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/pom.xml (original)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/pom.xml Sat Jan 12 00:50:08 2008
@@ -37,7 +37,7 @@
      </description> 
 
      <properties>
-       <jetspeedVersion>2.1.3-dev</jetspeedVersion>
+       <jetspeedVersion>2.1.3</jetspeedVersion>
      </properties>
 
      <dependencies>

Modified: geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java?rev=611389&r1=611388&r2=611389&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java
(original)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-geronimo/src/main/java/org/apache/geronimo/jetspeed/integration/JetspeedSerializerGBean.java
Sat Jan 12 00:50:08 2008
@@ -17,76 +17,73 @@
 package org.apache.geronimo.jetspeed.integration;
 
 import java.io.File;
-import java.io.FileInputStream;
 import java.io.FilenameFilter;
+import java.net.URL;
 import java.util.Arrays;
-import java.util.List;
 import java.util.HashMap;
+import java.util.List;
 import java.util.Map;
-import java.util.Properties;
-
-import java.net.URL;
-
-import org.apache.log4j.Level;
-import org.apache.log4j.Logger;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.gbean.GBeanInfo;
+import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.jetspeed.components.jndi.SpringJNDIStarter;
+import org.apache.jetspeed.engine.JetspeedEngineConstants;
 import org.apache.jetspeed.serializer.JetspeedSerializer;
 import org.apache.jetspeed.serializer.JetspeedSerializerImpl;
-import org.apache.jetspeed.engine.JetspeedEngineConstants;
+import org.apache.jetspeed.Jetspeed;
+import org.apache.log4j.Level;
+import org.apache.log4j.Logger;
 
-import org.apache.geronimo.kernel.util.ClassLoaderDumper;
-import org.apache.geronimo.gbean.GBeanInfo;
-import org.apache.geronimo.gbean.GBeanInfoBuilder;
 /**
  * Jetspeed Serializer  GBean
- * 
+ *
  * @version $Id: $
  */
 public class JetspeedSerializerGBean {
+    private final static Log log = LogFactory.getLog(JetspeedSerializerGBean.class);
 
     public JetspeedSerializerGBean(String driverClass, String url, String user, String password,
String logLevel, ClassLoader classLoader) throws Exception {
 
-        if ( driverClass == null )
+        if (driverClass == null)
             driverClass = "org.apache.derby.jdbc.EmbeddedDriver";
-        if ( url == null )
+        if (url == null)
             url = "jdbc:derby:JetspeedDB";
-        if ( user == null )
+        if (user == null)
             user = "";
-        if ( password == null )
+        if (password == null)
             password = "";
-        if ( logLevel == null )
+        if (logLevel == null)
             logLevel = "ERROR";
 
 
-
         JetspeedSerializer serializer = null;
 
         String applicationPath = getAppRoot(classLoader);
 
-        File file = new File(applicationPath,  "WEB-INF/j2-seed.xml");
+        File file = new File(applicationPath, "WEB-INF/j2-seed.xml");
         if (!file.exists()) {
-            System.out.println("Database has already been initialized");
+            log.info("Database has already been initialized");
             return;
         }
 
         String fileName = file.getAbsolutePath();
 
         String[] configFiles = parseFiles(new File(applicationPath, "WEB-INF/assembly").getAbsolutePath());
-        String[] bootConfigFiles = new String[] {"file:/" + new File(applicationPath, "WEB-INF/assembly/boot/geronimo-datasource.xml").getAbsolutePath()};
-                                       
-        HashMap context = new HashMap();
+        String[] bootConfigFiles = new String[]{"file://" + new File(applicationPath, "WEB-INF/assembly/boot/geronimo-datasource.xml").getAbsolutePath()};
+
+        HashMap<String, String> context = new HashMap<String, String>();
         context.put(SpringJNDIStarter.DATASOURCE_DRIVER, driverClass);
         context.put(SpringJNDIStarter.DATASOURCE_URL, url);
         context.put(SpringJNDIStarter.DATASOURCE_USERNAME, user);
         context.put(SpringJNDIStarter.DATASOURCE_PASSWORD, password);
 
-        Logger  logger = Logger.getLogger("org.springframework");
+        Logger logger = Logger.getLogger("org.springframework");
         Level level = logger.getLevel();
-        if ( logLevel.equalsIgnoreCase("INFO") )
+        if (logLevel.equalsIgnoreCase("INFO"))
             logger.setLevel(Level.INFO);
-        else
-            if ( logLevel.equalsIgnoreCase("WARN") )
+        else if (logLevel.equalsIgnoreCase("WARN"))
             logger.setLevel(Level.WARN);
         else
             logger.setLevel(Level.ERROR);
@@ -94,50 +91,47 @@
 /**
  * set the application root
  */
-        System.out.println("APP ROOT is " + applicationPath);
+        log.info("APP ROOT is " + applicationPath);
         System.setProperty(JetspeedEngineConstants.APPLICATION_ROOT_KEY, applicationPath);
-        System.setProperty("portal.name","jetspeed");
+        System.setProperty("portal.name", "jetspeed");
 
-        SpringJNDIStarter starter = new SpringJNDIStarter(context, applicationPath, bootConfigFiles,
configFiles);
+//        SpringJNDIStarter starter = new SpringJNDIStarter(context, applicationPath, bootConfigFiles,
configFiles);
 
-        System.out.println("starter framework created " + starter);
+//        log.info("starter framework created " + starter);
 
 
-        try {
-            starter.setUp();
-        }
-        catch ( Exception e ) {
-            e.printStackTrace();
-            System.exit(1);
-        }
-        System.out.println("starter framework established " + starter);
-        String[] importList = null;
+//        try {
+//            starter.setUp();
+//        }
+//        catch (Exception e) {
+//            log.warn("Could not set up srping jndi starter", e);
+//            return;
+//        }
+//        log.info("starter framework established " + starter);
 
         Map settings = new HashMap();
         settings.put(JetspeedSerializer.KEY_OVERWRITE_EXISTING, Boolean.TRUE);
 
         try {
-            System.out.println("processing import  " + fileName );
-            serializer = new JetspeedSerializerImpl(starter.getComponentManager());
+            log.info("processing import  " + fileName);
+            serializer = new JetspeedSerializerImpl(Jetspeed.getComponentManager());
             serializer.importData(fileName, settings);
-            System.out.println("processing import  " + fileName  + " done");
+            log.info("processing import  " + fileName + " done");
         }
-        catch ( Exception e ) {
-            System.err.println("Failed to process XML import for " + fileName + ":" + e);
-            e.printStackTrace();
-        }
-        finally {
-            if ( serializer != null )
-                serializer.closeUp();
+        catch (Exception e) {
+            log.warn("Failed to process XML import for " + fileName + ":" + e, e);
         }
+//        finally {
+//            if (serializer != null)
+//                serializer.closeUp();
+//        }
 
         try {
-            starter.tearDown();
-            logger.setLevel(level);;
+//            starter.tearDown();
+            logger.setLevel(level);
         }
-        catch ( Exception e1 ) {
-            System.out.println("starter framework teardown caused exception "  + e1.getLocalizedMessage());
-            e1.printStackTrace();
+        catch (Exception e1) {
+            log.info("starter framework teardown caused exception " + e1.getLocalizedMessage(),
e1);
 
         }
 
@@ -154,20 +148,19 @@
         // We then strip out the trailing end of the classpath to get the root.
         URL url = classLoader.getResource("org/apache/jetspeed/components/jndi/SpringJNDIStarter.class");
         if (url == null) {
-            System.out.println("SpringJNDIStarter.class is not in classpath");
+            log.info("SpringJNDIStarter.class is not in classpath");
             return null;
         }
 
         String path = url.getFile();
         int index = path.lastIndexOf("!");
         path = path.substring(0, index);
-        path = path.substring(path.indexOf("/") + 1);
+        path = path.substring(path.indexOf("/"));  //may not work on windows
         path = new File(path).getParentFile().getParentFile().getParent();
         return path;
     }
 
 
-
     public static final GBeanInfo GBEAN_INFO;
 
     static {
@@ -191,7 +184,7 @@
 
     /**
      * Filters the xml files in WEB-INF/assembly dir and return only those that are needed
to populate the database.
-     * 
+     *
      * @return one or more files to be processed
      */
     static private String[] parseFiles(String schemaDirectory) {
@@ -200,43 +193,39 @@
         String[] fileList = null;
         try {
             File dir = new File(schemaDirectory);
-            if ( !(dir.exists()) ) {
+            if (!(dir.exists())) {
                 return fileList;
             }
-            if ( !(dir.isDirectory()) ) {
+            if (!(dir.isDirectory())) {
                 fileList = new String[1];
                 fileList[0] = schemaDirectory;
                 return fileList;
             }
             // 	Handling a directory
             File[] files = dir.listFiles(
-                                        new FilenameFilter() {
-                                            public boolean accept(File dir, String name)

-                                            {String n = name.toLowerCase();
-                                                if (list.contains(n)) {
-                                                    return true;
-                                                }
-                                                if (n.startsWith("security-")) {
-                                                    return true;
-                                                }
-                                                return false;
-                                            }
-                                        });
-            if ( files == null )
+                    new FilenameFilter() {
+                        public boolean accept(File dir, String name) {
+                            String n = name.toLowerCase();
+                            if (list.contains(n)) {
+                                return true;
+                            }
+                            return n.startsWith("security-");
+                        }
+                    });
+            if (files == null)
                 return fileList;
 
             fileList = new String[files.length];
-            for ( int i = 0; i < files.length; i++ ) {
+            for (int i = 0; i < files.length; i++) {
                 fileList[i] = "file:/" + files[i].getAbsolutePath();
             }
             return fileList;
         }
-        catch ( Exception e ) {
-            e.printStackTrace(); 
+        catch (Exception e) {
             throw new IllegalArgumentException(
-                                              "Processing the schema-directory " + schemaDirectory
-                                              + " caused exception "
-                                              + e.getLocalizedMessage());
+                    "Processing the schema-directory " + schemaDirectory
+                            + " caused exception "
+                            + e.getLocalizedMessage(), e);
         }
 
 
@@ -244,14 +233,14 @@
 
     /**
      * Renamed the j2-ssed.xml and geronimo-datasource.xml to *.used format.
-     * When this gbean is run again, it will check for the existence of these xmls. 
+     * When this gbean is run again, it will check for the existence of these xmls.
      * If they don't exist, the database will not be populated again.
      * Some other files that are needed only for db population are deleted.
      */
     public void cleanup(String fileName, String[] bootFiles) {
         String gdXml = bootFiles[0];
         int index = gdXml.indexOf("/");
-        File file = new File(gdXml.substring(index+1));
+        File file = new File(gdXml.substring(index + 1));
         if (file.exists()) {
             file.renameTo(new File(file.getParentFile(), "geronimo-datasource.used"));
         }

Modified: geronimo/sandbox/jetspeed-integration/jetspeed-tomcat-assembly/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-tomcat-assembly/pom.xml?rev=611389&r1=611336&r2=611389&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-tomcat-assembly/pom.xml (original)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-tomcat-assembly/pom.xml Sat Jan 12 00:50:08
2008
@@ -26,10 +26,9 @@
         <groupId>org.apache.geronimo.assemblies</groupId>
         <artifactId>assemblies</artifactId>
         <version>2.1-SNAPSHOT</version>
-        <relativePath>../pom.xml</relativePath>
     </parent>
 
-    <artifactId>geronimo-tomcat6-javaee5</artifactId>
+    <artifactId>jetspeed-tomcat-assembly</artifactId>
     <name>Geronimo Assemblies :: JavaEE 5 + Tomcat</name>
     <packaging>application-assembly</packaging>
 
@@ -84,130 +83,22 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transaction</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis2</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis2-ejb</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-        <!--
-                <dependency>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>cxf</artifactId>
-                    <version>${version}</version>
-                    <type>car</type>
-                </dependency>
-
-                <dependency>
-                    <groupId>org.apache.geronimo.configs</groupId>
-                    <artifactId>cxf-ejb</artifactId>
-                    <version>${version}</version>
-                    <type>car</type>
-                </dependency>
-        -->
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>j2ee-corba-yoko</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat6</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-clustering-wadi</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>tomcat6-clustering-builder-wadi</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>system-database</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>activemq-broker</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>activemq-ra</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-system</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-security</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-corba-yoko</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>javamail</artifactId>
@@ -284,91 +175,18 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb-corba-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>persistence-jpa10-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis2-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>axis2-ejb-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>cxf-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>cxf-ejb-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>client-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>hot-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat6-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>welcome-tomcat</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>console-tomcat</artifactId>
@@ -396,35 +214,6 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>activemq-console-tomcat</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>plancreator-console-tomcat</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>remote-deploy-tomcat</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>uddi-tomcat</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>ca-helper-tomcat</artifactId>
@@ -438,21 +227,6 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>upgrade-cli</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>sharedlib</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>jsr88-cli</artifactId>
@@ -501,43 +275,24 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>mejb</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>jaxws-tools</artifactId>
-            <version>${version}</version>
-            <type>jar</type>
-        </dependency>
-
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>dojo-tomcat</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
-        <!-- Monitoring plugins -->
         <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>agent</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetspeed-tomcat</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
         <dependency>
-            <groupId>org.apache.geronimo.plugins</groupId>
-            <artifactId>mconsole-tomcat</artifactId>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jetspeed-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
-
     </dependencies>
 
     <build>

Modified: geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/pom.xml?rev=611389&r1=611388&r2=611389&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/pom.xml (original)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/pom.xml Sat Jan 12 00:50:08 2008
@@ -30,7 +30,7 @@
        This is the configuration for the Jetspeed Tomcat application
     </description>
     <properties>
-        <jetspeedVersion>2.1.3-dev</jetspeedVersion>
+        <jetspeedVersion>2.1.3</jetspeedVersion>
     </properties>
     <dependencies>
         <dependency>
@@ -81,6 +81,20 @@
              <version>1.0.1</version>
              <type>jar</type>
          </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>tomcat6-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jasper-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+            <scope>provided</scope>
+        </dependency>
     </dependencies>
 
     <build>
@@ -134,11 +148,11 @@
                         <version>${jetspeedVersion}</version>
                         <type>war</type>
                     </module>
-                    <commonInstance>
+                    <instance>
                         <plugin-artifact>
                           <source-repository>http://www.bluesunrise.com/maven</source-repository>
                         </plugin-artifact>
-                    </commonInstance>
+                    </instance>
                 </configuration>
             </plugin>
             <plugin>

Modified: geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/boot/geronimo-datasource.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/boot/geronimo-datasource.xml?rev=611389&r1=611388&r2=611389&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/boot/geronimo-datasource.xml
(original)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/boot/geronimo-datasource.xml
Sat Jan 12 00:50:08 2008
@@ -71,14 +71,12 @@
       However, if you need to locate/modify these files in a running instance of jetspeed,
       they will be located under /WEB-INF/classes.
      -->
-    <!--
   <bean id="JetspeedDS" class="org.apache.jetspeed.components.rdbms.ojb.ConnectionRepositoryEntry">
     <property name="jndiName">
       <value>java:comp/env/jdbc/jetspeed</value>
     </property>
   </bean>     
-       -->
-  
+
   <!-- If would like use a commons DBCP Pooled datasource as opposed to the default 
        JNDI one above you can uncomment the configuration below and fill in 
        the datasource information as it relates to your environment.
@@ -90,10 +88,10 @@
        This property is located in /etc/db-ojb/OJB.properties in the source tree.
     -->    
     
-    <bean id="JetspeedDS" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"
>
+<!--    <bean id="JetspeedDS" class="org.apache.commons.dbcp.BasicDataSource" destroy-method="close"
>
                 <property name="driverClassName"><value>org.apache.derby.jdbc.EmbeddedDriver</value></property>
                 <property name="url"><value>jdbc:derby:JetspeedDB</value></property>
                 <property name="username"><value></value></property>
                 <property name="password"><value></value></property>
-        </bean>        
+        </bean> -->
 </beans>

Modified: geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/plan/plan.xml?rev=611389&r1=611388&r2=611389&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/sandbox/jetspeed-integration/jetspeed-tomcat/src/main/plan/plan.xml Sat Jan 12
00:50:08 2008
@@ -17,22 +17,20 @@
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
     <context-root>/jetspeed</context-root>
 
-    <resource-ref>
-           <ref-name>jdbc/jetspeed</ref-name>
-           <resource-link>JetspeedDS</resource-link>
-    </resource-ref>
-
     <security-realm-name>geronimo-admin</security-realm-name>
     <security xmlns="http://geronimo.apache.org/xml/ns/security-1.2">
         <role-mappings>
             <role role-name="admin">
-                <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"
name="admin" />
+                <principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"
name="admin"/>
             </role>
         </role-mappings>
     </security>
 
     <gbean name="PopulateDB" class="org.apache.geronimo.jetspeed.integration.JetspeedSerializerGBean">
-      <attribute name="logLevel">INFO</attribute>
+        <attribute name="logLevel">INFO</attribute>
+        <dependency>
+            <name>org.apache.geronimo.configs/jetspeed-tomcat/2.1-SNAPSHOT/car</name>
+        </dependency>
     </gbean>
 
 </web-app>

Modified: geronimo/sandbox/jetspeed-integration/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/sandbox/jetspeed-integration/pom.xml?rev=611389&r1=611388&r2=611389&view=diff
==============================================================================
--- geronimo/sandbox/jetspeed-integration/pom.xml (original)
+++ geronimo/sandbox/jetspeed-integration/pom.xml Sat Jan 12 00:50:08 2008
@@ -34,6 +34,7 @@
       <module>jetspeed-derby-database</module>
       <module>jetspeed-tomcat</module>
       <module>geronimo-jetspeed-deployer</module>
+      <module>jetspeed-tomcat-assembly</module>
     </modules>
 
     <build>



Mime
View raw message