You are viewing a plain text version of this content. The canonical link for it is here.
Posted to jetspeed-dev@portals.apache.org by at...@apache.org on 2007/03/27 01:55:41 UTC

svn commit: r522665 [29/29] - in /portals/jetspeed-2/branches/J2-M2-REDUX: ./ components/ components/jetspeed-cm/ components/jetspeed-cm/src/test/java/org/apache/jetspeed/cache/general/ components/jetspeed-cm/src/test/resources/ components/jetspeed-cm/...

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PortletWindow.js
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/PortletWindow.js
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/SiteManagerTreeRPCController.js
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/SiteManagerTreeRPCController.js?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/SiteManagerTreeRPCController.js (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/SiteManagerTreeRPCController.js Mon Mar 26 16:53:34 2007
@@ -0,0 +1,43 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+
+dojo.provide("jetspeed.widget.SiteManagerTreeRPCController");
+
+dojo.require("dojo.widget.TreeRPCController");
+
+jetspeed.widget.SiteManagerTreeRPCController = function()
+{    
+    this.widgetType = "SiteManagerTreeRPCController";
+    dojo.widget.TreeRPCController.call(this);
+};
+
+dojo.inherits( jetspeed.widget.SiteManagerTreeRPCController, dojo.widget.TreeRPCController );
+
+dojo.lang.extend( jetspeed.widget.SiteManagerTreeRPCController,
+{
+    doRemoveNode: function(node, callObj, callFunc)
+    {
+        var args = [ node, callObj, callFunc ];
+        dojo.widget.TreeLoadingController.prototype.doRemoveNode.apply(this, args);
+    },
+    doCreateChild: function(parent, index, output, callObj, callFunc)
+    {
+        if ( output == null ) output = {};
+        var args = [parent, index, output, callObj, callFunc];
+		dojo.widget.TreeLoadingController.prototype.doCreateChild.apply(this, args);
+    }
+});

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/SiteManagerTreeRPCController.js
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/TitlePane.html
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/TitlePane.html?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/TitlePane.html (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/TitlePane.html Mon Mar 26 16:53:34 2007
@@ -0,0 +1,24 @@
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+-->
+<!--  need to wrap inside a body tag to allow the above license header
+      dojo will look for a body tag and use its content -->
+<body>
+<div dojoAttachPoint="domNode">
+<div dojoAttachPoint="labelNode" dojoAttachEvent="onclick: onLabelClick" class="${this.labelNodeClass}">${this.label}</div>
+<div class="body"><div dojoAttachPoint="containerNode" style="overflow: hidden;" class="${this.containerNodeClass}"></div></div>
+</div>
+</body>
\ No newline at end of file

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/TitlePane.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/javascript/jetspeed/widget/TitlePane.html
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/login.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/login.jsp?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/login.jsp (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/login.jsp Mon Mar 26 16:53:34 2007
@@ -0,0 +1,28 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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.
+--%>
+<html>
+  <title>Login</title>
+  <body>
+    <form method="POST" action='<%= response.encodeURL("j_security_check")%>'>
+      Username <input type="text" size="15" name="j_username">
+      <br>
+      Password <input type="password" size="15" name="j_password">
+      <input type="submit" value="Login">
+    </form>
+  </body>
+</html> 
+

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/login.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/login.jsp
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logout.jsp
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logout.jsp?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logout.jsp (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logout.jsp Mon Mar 26 16:53:34 2007
@@ -0,0 +1,20 @@
+<%--
+Licensed to the Apache Software Foundation (ASF) under one or more
+contributor license agreements.  See the NOTICE file distributed with
+this work for additional information regarding copyright ownership.
+The ASF licenses this file to You 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.
+--%>
+<%
+ request.getSession().invalidate();
+ response.sendRedirect("");
+%>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logout.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logout.jsp
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logs/deployment.log
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logs/deployment.log?view=auto&rev=522665
==============================================================================
    (empty)

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logs/digester.log
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logs/digester.log?view=auto&rev=522665
==============================================================================
    (empty)

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logs/digester.log
------------------------------------------------------------------------------
    svn:executable = *

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logs/jetspeed.log
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logs/jetspeed.log?view=auto&rev=522665
==============================================================================
    (empty)

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logs/ojb.log
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logs/ojb.log?view=auto&rev=522665
==============================================================================
    (empty)

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logs/ojb.log
------------------------------------------------------------------------------
    svn:executable = *

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logs/pluto.log
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logs/pluto.log?view=auto&rev=522665
==============================================================================
    (empty)

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logs/scheduler.log
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logs/scheduler.log?view=auto&rev=522665
==============================================================================
    (empty)

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logs/scheduler.log
------------------------------------------------------------------------------
    svn:executable = *

Added: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logs/velocity.log
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logs/velocity.log?view=auto&rev=522665
==============================================================================
    (empty)

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/jetspeed-portal-resources/src/main/resources/webapp/logs/velocity.log
------------------------------------------------------------------------------
    svn:executable = *

Added: portals/jetspeed-2/branches/J2-M2-REDUX/maven/jetspeed-ddl-generator/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/maven/jetspeed-ddl-generator/pom.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/maven/jetspeed-ddl-generator/pom.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/maven/jetspeed-ddl-generator/pom.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,71 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+  
+  $Id$
+-->
+<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>
+  <prerequisites>
+    <maven>2.0.5</maven>
+  </prerequisites>
+
+  <artifactId>jetspeed-ddl-generator</artifactId>
+  <name>Jetspeed-2 DDL Generator Maven Plugin</name>
+  <description>Maven Plugin for generating Jetspeed-2 ddl scripts</description>
+  <parent>
+    <groupId>org.apache.portals.jetspeed-2</groupId>
+    <artifactId>maven</artifactId>
+    <version>J2-M2-REDUX-SNAPSHOT</version>
+  </parent>
+  <packaging>maven-plugin</packaging>
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>2.0.5</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+      <version>2.0.5</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <artifactId>plexus-utils</artifactId>
+      <groupId>org.codehaus.plexus</groupId>
+      <version>1.4.1</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>ddlutils</groupId>
+      <artifactId>ddlutils</artifactId>
+      <version>1.0-RC1-PATCHED</version>
+    </dependency>
+  </dependencies>
+  <build>
+    <plugins>
+      <plugin>
+        <artifactId>maven-plugin-plugin</artifactId>        
+        <configuration>
+          <goalPrefix>jetspeed</goalPrefix>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+</project>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/maven/jetspeed-ddl-generator/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/maven/jetspeed-ddl-generator/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/maven/jetspeed-ddl-generator/src/main/java/org/apache/jetspeed/maven/ddl/DDLGeneratorMojo.java
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/maven/jetspeed-ddl-generator/src/main/java/org/apache/jetspeed/maven/ddl/DDLGeneratorMojo.java?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/maven/jetspeed-ddl-generator/src/main/java/org/apache/jetspeed/maven/ddl/DDLGeneratorMojo.java (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/maven/jetspeed-ddl-generator/src/main/java/org/apache/jetspeed/maven/ddl/DDLGeneratorMojo.java Mon Mar 26 16:53:34 2007
@@ -0,0 +1,299 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You 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.
+ */
+package org.apache.jetspeed.maven.ddl;
+
+import java.io.File;
+import java.io.FileWriter;
+import java.io.IOException;
+
+import org.apache.ddlutils.Platform;
+import org.apache.ddlutils.PlatformFactory;
+import org.apache.ddlutils.io.DatabaseIO;
+import org.apache.ddlutils.model.Database;
+import org.apache.ddlutils.model.Table;
+import org.apache.ddlutils.platform.CreationParameters;
+import org.apache.ddlutils.task.TableSpecificParameter;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.MojoFailureException;
+import org.apache.maven.project.MavenProject;
+import org.codehaus.plexus.util.DirectoryScanner;
+
+/**
+ * @version $Id$
+ * @goal ddl
+ * @phase process-resources
+ */
+public class DDLGeneratorMojo extends AbstractMojo
+{
+    /** The DDLUtils databases
+     * @parameter
+     * @required
+     */
+    private String[] databases;
+
+    /** Whether to use delimited SQL identifiers.
+     * @parameter default-value="false"
+     */
+    private boolean useDelimitedSqlIdentifiers;
+    
+    /** Whether read foreign keys shall be sorted.
+     * @parameter default-value="false"
+     */
+    private boolean sortForeignKeys;
+    
+    /** The set of ddl schema filenames. Schema names may
+     * include wildcards.
+     * @parameter
+     */
+    private String[] schemas;
+    
+    /**
+     * The output directory where the ddl scripts will be generated
+     * @parameter expression="${project.build.directory}/generated-sources/schema-ddl"
+     */
+    private String outputTarget;
+    
+    /**
+     * @parameter
+     */
+    private TableSpecificParameter[] parameters;
+    
+    /**
+     * @parameter default-value="false"
+     */
+    private boolean validateXml;
+    
+    /**
+     * @parameter default-value="true"
+     */
+    private boolean useInternalDtd;
+    
+    /**
+     * Specifies whether SQL for dropping tables, external constraints, etc. is created if necessary.
+     * 
+     * @parameter default-value="true"
+     */
+    private boolean doDrops;
+    
+    /** The Maven project.
+     * @parameter expression="${project}"
+     * @required
+     * @readonly
+     */
+    private MavenProject project;
+    
+    public void execute() throws MojoExecutionException, MojoFailureException
+    {
+        File[] schemaFiles = getSchemaFiles();
+        if ( schemaFiles.length > 0)
+        {
+            Database model = readModel(schemaFiles);
+            Platform platforms[] = new Platform[databases.length];
+            if ( databases.length == 0 )
+            {
+                getLog().warn("No databases specified, no ddl generated");
+            }
+            else
+            {
+                for ( int i = 0; i < databases.length; i++ )
+                {            
+                    try
+                    {
+                        platforms[i] = PlatformFactory.createNewPlatformInstance(databases[i]);
+                    }
+                    catch (Exception ex)
+                    {
+                        throw new MojoExecutionException("Database type "+databases[i]+" is not supported.", ex);
+                    }
+                    if (platforms[i] == null)
+                    {
+                        throw new MojoExecutionException("Database type "+databases[i]+" is not supported.");
+                    }
+                    platforms[i].setDelimitedIdentifierModeOn(useDelimitedSqlIdentifiers);
+                    platforms[i].setForeignKeysSorted(sortForeignKeys);
+                }
+                
+                for (int i = 0; i < platforms.length; i++ )
+                {
+                    Platform platform = platforms[i];
+                    platform.setScriptModeOn(true);
+                    File outputDir = new File(outputTarget,databases[i].toLowerCase());
+                    if ( !outputDir.exists() )
+                    {
+                        outputDir.mkdirs();
+                    }
+                    File outputFile = new File(outputDir,databases[i].toLowerCase()+"-schema.sql");
+                    if (outputFile.exists() && (!outputFile.isFile() || !outputFile.canWrite())) 
+                    {
+                        throw new MojoExecutionException("Cannot write to output file "+outputFile.getAbsolutePath());
+                    }
+                    FileWriter writer = null;
+                    try
+                    {
+                        writer = new FileWriter(outputFile);
+                    }
+                    catch (IOException ioe)
+                    {
+                        throw new MojoExecutionException("Cannot open output file "+outputFile.getAbsolutePath(), ioe);
+                    }
+                    if (platform.getPlatformInfo().isSqlCommentsSupported())
+                    {
+                        // we're generating SQL comments if possible
+                        platform.setSqlCommentsOn(true);
+                    }
+                    boolean isCaseSensitive = platform.isDelimitedIdentifierModeOn();
+                    CreationParameters params = getFilteredParameters(model, platform.getName(), isCaseSensitive);
+                    platform.getSqlBuilder().setWriter(writer);
+                    try
+                    {
+                        platform.getSqlBuilder().createTables(model, params, doDrops);
+                    }
+                    catch (IOException ioe)
+                    {
+                        throw new MojoExecutionException("Failed to generate ddl script "+outputFile.getAbsolutePath(), ioe);
+                    }
+                    try
+                    {
+                        writer.close();
+                    }
+                    catch (IOException ioe)
+                    {
+                        throw new MojoExecutionException("Failed to close output file "+outputFile.getAbsolutePath(), ioe);
+                    }
+                    getLog().info("Written "+databases[i]+" schema sql to " + outputFile.getAbsolutePath());
+                }
+            }
+        }
+    }
+    
+    protected File[] getSchemaFiles()
+    {
+        if (schemas == null  ||  schemas.length == 0)
+        {
+            schemas = new String[]{"src/main/ddl-schema/*.xml"};
+        }
+        DirectoryScanner ds = new DirectoryScanner();
+        final File baseDir = project.getBasedir();
+        ds.setBasedir(baseDir);
+        ds.setIncludes(schemas);
+        ds.scan();
+        String[] files = ds.getIncludedFiles();
+        File[] schemaFiles = new File[files.length];
+        for (int i = 0;  i < schemaFiles.length;  i++)
+        {
+            schemaFiles[i] = new File(baseDir, files[i]);
+        }
+        if (schemaFiles.length == 0) {
+            StringBuffer sb = new StringBuffer();
+            sb.append("Schema specification returns no result: ");
+            for (int i = 0;  i < schemas.length;  i++)
+            {
+                if (i > 0) 
+                {
+                    sb.append(",");
+                }
+                sb.append(schemas[i]);
+            }
+            getLog().warn(sb);
+        }
+        return schemaFiles;
+    }
+
+    protected Database readModel(File[] files) throws MojoExecutionException
+    {
+        DatabaseIO reader = new DatabaseIO();
+        Database   model  = null;
+
+        reader.setValidateXml(validateXml);
+        reader.setUseInternalDtd(useInternalDtd);
+        
+        for (int idx = 0; (files != null) && (idx < files.length); idx++)
+        {
+            Database curModel = null;
+            if (!files[idx].isFile())
+            {
+                throw new MojoExecutionException("Path " + files[idx].getAbsolutePath() + " does not denote a file");
+            }
+            else if (!files[idx].canRead())
+            {
+                throw new MojoExecutionException("Could not read schema file " + files[idx].getAbsolutePath());
+            }
+            else
+            {
+                try
+                {
+                    curModel = reader.read(files[idx]);
+                    getLog().info("Read schema file " + files[idx].getAbsolutePath());
+                }
+                catch (Exception ex)
+                {
+                    throw new MojoExecutionException("Could not read schema file "+files[idx].getAbsolutePath()+": "+ex.getLocalizedMessage(), ex);
+                }
+            }
+
+            if (model == null)
+            {
+                model = curModel;
+            }
+            else if (curModel != null)
+            {
+                try
+                {
+                    model.mergeWith(curModel);
+                }
+                catch (IllegalArgumentException ex)
+                {
+                    throw new MojoExecutionException("Could not merge with schema from file "+files[idx]+": "+ex.getLocalizedMessage(), ex);
+                }
+            }
+        }
+        return model;
+    }
+    
+    /**
+     * Filters the parameters for the given model and platform.
+     * 
+     * @param model           The database model
+     * @param platformName    The name of the platform
+     * @param isCaseSensitive Whether case is relevant when comparing names of tables
+     * @return The filtered parameters
+     */
+    protected CreationParameters getFilteredParameters(Database model, String platformName, boolean isCaseSensitive)
+    {
+        CreationParameters creationParameters = new CreationParameters();
+
+        if ( parameters != null ) {
+            for (int i=0; i < parameters.length; i++ )
+            {
+                if (parameters[i].isForPlatform(platformName))
+                {
+                    for (int idx = 0; idx < model.getTableCount(); idx++)
+                    {
+                        Table table = model.getTable(idx);
+
+                        if (parameters[i].isForTable(table, isCaseSensitive))
+                        {
+                            creationParameters.addParameter(table, parameters[i].getName(), parameters[i].getValue());
+                        }
+                    }
+                }
+            }
+        }
+        return creationParameters;
+    }
+}

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/maven/jetspeed-ddl-generator/src/main/java/org/apache/jetspeed/maven/ddl/DDLGeneratorMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/maven/jetspeed-ddl-generator/src/main/java/org/apache/jetspeed/maven/ddl/DDLGeneratorMojo.java
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/maven/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/maven/pom.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/maven/pom.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/maven/pom.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You 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.
+    
+    $Id$
+-->
+<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>
+    <prerequisites>
+        <maven>2.0.5</maven>
+    </prerequisites>
+    
+    <artifactId>maven</artifactId>
+    <name>Jetspeed-2 Maven Plugins</name>
+    <description>Jetspeed-2 Maven Plugins</description>
+    <parent>
+        <groupId>org.apache.portals.jetspeed-2</groupId>
+        <artifactId>jetspeed-2</artifactId>
+        <version>J2-M2-REDUX-SNAPSHOT</version>
+    </parent>
+    <packaging>pom</packaging>
+
+    <modules>
+        <module>jetspeed-ddl-generator</module>
+    </modules>
+    
+</project>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/maven/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/maven/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/jetspeed-2/branches/J2-M2-REDUX/pom.xml
URL: http://svn.apache.org/viewvc/portals/jetspeed-2/branches/J2-M2-REDUX/pom.xml?view=auto&rev=522665
==============================================================================
--- portals/jetspeed-2/branches/J2-M2-REDUX/pom.xml (added)
+++ portals/jetspeed-2/branches/J2-M2-REDUX/pom.xml Mon Mar 26 16:53:34 2007
@@ -0,0 +1,877 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You 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.
+  
+  $Id$
+-->
+<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>
+  <prerequisites>
+    <maven>2.0.5</maven>
+  </prerequisites>
+
+  <groupId>org.apache.portals.jetspeed-2</groupId>
+  <artifactId>jetspeed-2</artifactId>
+  <name>Jetspeed-2 Enterprise Portal</name>
+  <version>J2-M2-REDUX-SNAPSHOT</version>
+  <packaging>pom</packaging>
+  <description>
+    Jetspeed is an Open Source implementation of an Enterprise Information Portal, using Java and XML.
+  </description>
+  <url>http://portals.apache.org/jetspeed-2</url>
+
+  <organization>
+    <name>Apache Software Foundation</name>
+    <url>http://portals.apache.org/</url>
+  </organization>
+  <licenses>
+    <license>
+      <name>Apache License, Version 2.0</name>
+      <url>http://www.apache.org/licenses/LICENSE-2.0.html</url>
+      <distribution>repo</distribution>
+    </license>
+  </licenses>
+  <issueManagement>
+    <system>Jira</system>
+    <url>http://issues.apache.org/jira/browse/JS2</url>
+  </issueManagement>
+  <inceptionYear>1999</inceptionYear>
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/portals/jetspeed-2/branches/J2-M2-REDUX</connection>
+    <developerConnection>
+      scm:svn:https://svn.apache.org/repos/asf/portals/jetspeed-2/branches/J2-M2-REDUX
+    </developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/portals/jetspeed-2/branches/J2-M2-REDUX</url>
+  </scm>
+  <mailingLists>
+    <mailingList>
+      <name>Jetspeed 2 User List</name>
+      <subscribe>jetspeed-user-subscribe@portals.apache.org</subscribe>
+      <unsubscribe>jetspeed-user-unsubscribe@portals.apache.org</unsubscribe>
+      <post>jetspeed-user@portals.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/portals-jetspeed-user/</archive>
+    </mailingList>
+    <mailingList>
+      <name>Jetspeed 2 Developer List</name>
+      <subscribe>jetspeed-dev-subscribe@portals.apache.org</subscribe>
+      <unsubscribe>jetspeed-dev-unsubscribe@portals.apache.org</unsubscribe>
+      <post>jetspeed-dev@portals.apache.org</post>
+      <archive>http://mail-archives.apache.org/mod_mbox/portals-jetspeed-dev/</archive>
+    </mailingList>
+  </mailingLists>
+  <developers>
+    <developer>
+      <name>David Sean Taylor</name>
+      <id>taylor</id>
+      <email>taylor@apache.org</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Raphael Luta</name>
+      <id>raphael</id>
+      <email>raphael@apache.org</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Mark Orciuch</name>
+      <id>mark</id>
+      <email>mark_oriuch@nqsltd.com</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Paul Spencer</name>
+      <id>paulsp</id>
+      <email>paulsp@apache.org</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Scott Weaver</name>
+      <id>weaver</id>
+      <email>Sweaver@rippe.com</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Roger Ruttimann</name>
+      <id>roger</id>
+      <email>rogerrut@apache.org</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>David Le Strat</name>
+      <id>dls</id>
+      <email>dlestrat@apache.org</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Jeremy Ford</name>
+      <id>jford</id>
+      <email>jford@apache.org</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Ate Douma</name>
+      <id>ate</id>
+      <email>ate@apache.org</email>
+      <timezone>+2</timezone>
+      <organization>Hippo</organization>
+      <organizationUrl>http://www.hippo.nl</organizationUrl>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Shinsuke Sugaya</name>
+      <id>shinsuke</id>
+      <email>shinsuke@apache.org</email>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+    <developer>
+      <name>Randy Watler</name>
+      <id>rwatler</id>
+      <email>rwatler@apache.org</email>
+      <timezone>-6</timezone>
+      <roles>
+        <role>Java Developer</role>
+      </roles>
+    </developer>
+  </developers>
+
+
+  <repositories>
+    <repository>
+      <id>com.bluesunrise.m2</id>
+      <name>Maven2 BlueSunrise</name>
+      <url>http://www.bluesunrise.com/maven2</url>
+    </repository>
+    <repository>
+      <id>central</id>
+      <name>Maven Repository Switchboard</name>
+      <url>http://repo1.maven.org/maven2</url>
+    </repository>
+    <repository>
+      <id>com.bluesunrise.m1</id>
+      <name>Maven1 BlueSunrise</name>
+      <url>http://www.bluesunrise.com/maven</url>
+      <layout>legacy</layout>
+    </repository>
+    <repository>
+      <id>org.codehaus.m2</id>
+      <name>Maven2 Codehaus</name>
+      <url>http://repository.codehaus.org</url>
+    </repository>
+    <repository>
+      <id>org.codehaus</id>
+      <name>Maven1 Codehaus</name>
+      <url>http://dist.codehaus.org</url>
+      <layout>legacy</layout>
+    </repository>
+    <repository>
+      <id>org.apache</id>
+      <name>Maven1 Apache</name>
+      <url>http://www.ibiblio.org/maven2</url>
+      <layout>legacy</layout>
+    </repository>
+  </repositories>
+  <pluginRepositories>
+    <pluginRepository>
+      <releases>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <id>com.bluesunrise.m2</id>
+      <name>Maven2 BlueSunrise Plugin</name>
+      <url>http://www.bluesunrise.com/maven2</url>
+    </pluginRepository>
+    <pluginRepository>
+      <releases>
+        <updatePolicy>never</updatePolicy>
+      </releases>
+      <id>central</id>
+      <name>Maven Plugin Repository</name>
+      <url>http://repo1.maven.org/maven2</url>
+    </pluginRepository>
+  </pluginRepositories>
+
+  <!-- Properties -->
+  <properties>
+
+    <!-- Default Build Properties -->    
+    <maven.test.skip>true</maven.test.skip>    
+    
+    <!-- Build Dependency Version Properties -->
+    <ant.version>1.6.5</ant.version>
+    <jmock.version>1.0.1</jmock.version>
+    <junit.version>3.8.1</junit.version>
+    <mockrunner.version>0.2.7</mockrunner.version>
+    <org.apache.maven.artifact.ant.version>2.0.5</org.apache.maven.artifact.ant.version>
+    <!--
+      Bug: using specific version of surefire plugin
+      to ensure test isolation for spring test cases;
+      specifically connection datasource management.
+      
+      TODO: Ate validate this is still needed
+      <org.apache.maven.plugins.maven-surefire-plugin.version>2.1.3</org.apache.maven.plugins.maven-surefire-plugin.version>
+    -->
+    <torque.version>3.2-rc3</torque.version>
+    <tyrex.version>1.0.1</tyrex.version>
+
+    <!-- Project Dependency Version Properties -->
+    <aopalliance.version>1.0</aopalliance.version>
+    <castor.version>0.9.4.3</castor.version>
+    <cglib.version>2.0.2</cglib.version>
+    <commons-beanutils.version>1.7.0</commons-beanutils.version>
+    <commons-betwixt.version>20061115</commons-betwixt.version>
+    <commons-codec.version>1.3</commons-codec.version>
+    <commons-collections.version>3.1</commons-collections.version>
+    <commons-configuration.version>1.1</commons-configuration.version>
+    <commons-dbcp.version>1.2.1</commons-dbcp.version>
+    <commons-digester.version>1.5</commons-digester.version>
+    <commons-fileupload.version>1.0</commons-fileupload.version>
+    <commons-httpclient.version>3.0</commons-httpclient.version>
+    <commons-io.version>0.1</commons-io.version>
+    <commons-lang.version>2.1</commons-lang.version>
+    <commons-logging.version>1.0.3</commons-logging.version>
+    <commons-pool.version>1.2</commons-pool.version>
+    <ddlutils.version>1.0-RC1-PATCHED</ddlutils.version>
+    <directory.version>0.9.3</directory.version>
+    <ehcache.version>1.2.4</ehcache.version>
+    <hsqldb.version>1.8.0.2</hsqldb.version>
+    <javolution.version>4.0.2</javolution.version>
+    <javax.activation.version>1.0.2</javax.activation.version>
+    <javax.mail.version>1.3.3</javax.mail.version>
+    <javax.servlet.jstl.version>1.0.6</javax.servlet.jstl.version>
+    <javax.servlet.version>2.3</javax.servlet.version>
+    <javax.sql.version>2.0</javax.sql.version>
+    <javax.transaction.version>1.0.1B</javax.transaction.version>
+    <jaxen.version>1.0-FCS</jaxen.version>
+    <jdom.version>1.0</jdom.version>
+    <log4j.version>1.2.8</log4j.version>
+    <lucene.version>2.0.0</lucene.version>
+    <myfaces.version>1.1.0</myfaces.version>
+    <nekohtml.version>0.9.5</nekohtml.version>
+    <ojb.version>1.0.3</ojb.version>
+    <org.apache.derby.version>10.1.1.0</org.apache.derby.version>
+    <org.apache.pluto.version>1.0.1</org.apache.pluto.version>
+    <org.apache.portals.bridges.common.version>1.0.2-RC</org.apache.portals.bridges.common.version>
+    <org.apache.portals.bridges.frameworks.version>1.0.2-RC</org.apache.portals.bridges.frameworks.version>
+    <org.apache.portals.bridges.jpetstore.version>1.0.2-RC</org.apache.portals.bridges.jpetstore.version>
+    <org.apache.portals.bridges.jsf-demo.version>1.0.2-RC</org.apache.portals.bridges.jsf-demo.version>
+    <org.apache.portals.bridges.jsf.version>1.0.2-RC</org.apache.portals.bridges.jsf.version>
+    <org.apache.portals.bridges.velocity.version>1.0.2-RC</org.apache.portals.bridges.velocity.version>
+    <org.apache.portals.bridges.portletfilter.version>1.0.2-RC</org.apache.portals.bridges.portletfilter.version>
+    <oro.version>2.0.7</oro.version>
+    <portlet-api.version>1.0</portlet-api.version>
+    <regexp.version>1.2</regexp.version>
+    <rome.version>0.8</rome.version>
+    <saxpath.version>1.0-FCS</saxpath.version>
+    <spring.version>2.0</spring.version>
+    <spring.modules.version>0.6</spring.modules.version>
+    <taglibs-random.version>1.0.2</taglibs-random.version>
+    <taglibs-request.version>1.0.1</taglibs-request.version>
+    <taglibs-standard.version>1.0.6</taglibs-standard.version>
+    <velocity-tools.version>1.2</velocity-tools.version>
+    <velocity.version>1.4</velocity.version>
+    <xalan.version>2.4.1</xalan.version>
+    <xerces.version>2.3.0</xerces.version>
+    <xml-apis.version>1.0.b2</xml-apis.version>
+  </properties>
+
+  <!-- Dependency Configuration -->
+
+  <dependencyManagement>
+    <dependencies>
+      <dependency>
+        <groupId>${pom.groupId}</groupId>
+        <artifactId>jetspeed-api</artifactId>
+        <version>${pom.version}</version>
+      </dependency>
+      <!-- Standard APIs -->
+      <dependency>
+        <groupId>portlet-api</groupId>
+        <artifactId>portlet-api</artifactId>
+        <version>${portlet-api.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>servlet-api</artifactId>
+        <version>${javax.servlet.version}</version>
+      </dependency>
+
+      <!-- Pluto Container -->
+      <dependency>
+        <groupId>org.apache.pluto</groupId>
+        <artifactId>pluto</artifactId>
+        <version>${org.apache.pluto.version}</version>
+      </dependency>
+
+      <!-- OJB -->
+      <dependency>
+        <groupId>ojb</groupId>
+        <artifactId>db-ojb</artifactId>
+        <version>${ojb.version}</version>
+      </dependency>
+
+      <!-- Spring Framework -->
+      <dependency>
+        <groupId>cglib</groupId>
+        <artifactId>cglib-full</artifactId>
+        <version>${cglib.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>aopalliance</groupId>
+        <artifactId>aopalliance</artifactId>
+        <version>${aopalliance.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-portlet</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-beans</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-context</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-core</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-web</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-webmvc</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-mock</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.springframework</groupId>
+        <artifactId>spring-support</artifactId>
+        <version>${spring.version}</version>
+      </dependency>
+      <!-- Spring Framework Modules -->
+      <dependency>
+        <groupId>org.springmodules</groupId>
+        <artifactId>spring-modules-ojb</artifactId>
+        <version>${spring.modules.version}</version>
+      </dependency>
+
+      <!-- Jakarta -->
+      <dependency>
+        <groupId>lucene</groupId>
+        <artifactId>lucene-core</artifactId>
+        <version>${lucene.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>log4j</groupId>
+        <artifactId>log4j</artifactId>
+        <version>${log4j.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>oro</groupId>
+        <artifactId>oro</artifactId>
+        <version>${oro.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>regexp</groupId>
+        <artifactId>regexp</artifactId>
+        <version>${regexp.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-configuration</groupId>
+        <artifactId>commons-configuration</artifactId>
+        <version>${commons-configuration.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-lang</groupId>
+        <artifactId>commons-lang</artifactId>
+        <version>${commons-lang.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-logging</groupId>
+        <artifactId>commons-logging</artifactId>
+        <version>${commons-logging.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-io</groupId>
+        <artifactId>commons-io</artifactId>
+        <version>${commons-io.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-httpclient</groupId>
+        <artifactId>commons-httpclient</artifactId>
+        <version>${commons-httpclient.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-fileupload</groupId>
+        <artifactId>commons-fileupload</artifactId>
+        <version>${commons-fileupload.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
+        <version>${commons-beanutils.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-collections</groupId>
+        <artifactId>commons-collections</artifactId>
+        <version>${commons-collections.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-pool</groupId>
+        <artifactId>commons-pool</artifactId>
+        <version>${commons-pool.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-dbcp</groupId>
+        <artifactId>commons-dbcp</artifactId>
+        <version>${commons-dbcp.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-digester</groupId>
+        <artifactId>commons-digester</artifactId>
+        <version>${commons-digester.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-codec</groupId>
+        <artifactId>commons-codec</artifactId>
+        <version>${commons-codec.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>ehcache</groupId>
+        <artifactId>ehcache</artifactId>
+        <version>${ehcache.version}</version>
+      </dependency>
+
+      <!-- Test -->
+      <dependency>
+        <groupId>junit</groupId>
+        <artifactId>junit</artifactId>
+        <version>${junit.version}</version>
+        <scope>test</scope>
+        <exclusions>
+          <exclusion>
+            <groupId>junit-addons</groupId>
+            <artifactId>junit-addons-runner</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+      <dependency>
+        <groupId>jmock</groupId>
+        <artifactId>jmock</artifactId>
+        <version>${jmock.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>mockrunner</groupId>
+        <artifactId>mockrunner</artifactId>
+        <version>${mockrunner.version}</version>
+        <scope>test</scope>
+      </dependency>
+      <dependency>
+        <groupId>tyrex</groupId>
+        <artifactId>tyrex</artifactId>
+        <version>${tyrex.version}</version>
+        <scope>test</scope>
+      </dependency>
+
+      <!-- XML -->
+      <dependency>
+        <groupId>castor</groupId>
+        <artifactId>castor</artifactId>
+        <version>${castor.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>xml-apis</groupId>
+        <artifactId>xml-apis</artifactId>
+        <version>${xml-apis.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>xerces</groupId>
+        <artifactId>xercesImpl</artifactId>
+        <version>${xerces.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>xalan</groupId>
+        <artifactId>xalan</artifactId>
+        <version>${xalan.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>jdom</groupId>
+        <artifactId>jdom</artifactId>
+        <version>${jdom.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>saxpath</groupId>
+        <artifactId>saxpath</artifactId>
+        <version>${saxpath.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>jaxen</groupId>
+        <artifactId>jaxen</artifactId>
+        <version>${jaxen.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>nekohtml</groupId>
+        <artifactId>nekohtml</artifactId>
+        <version>${nekohtml.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>javolution</groupId>
+        <artifactId>javolution</artifactId>
+        <version>${javolution.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-beanutils</groupId>
+        <artifactId>commons-beanutils</artifactId>
+        <version>${commons-beanutils.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>commons-betwixt</groupId>
+        <artifactId>commons-betwixt</artifactId>
+        <version>${commons-betwixt.version}</version>
+      </dependency>
+
+      <!-- Database -->
+      <dependency>
+        <groupId>javax.transaction</groupId>
+        <artifactId>jta</artifactId>
+        <version>${javax.transaction.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.sql</groupId>
+        <artifactId>jdbc-stdext</artifactId>
+        <version>${javax.sql.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.derby</groupId>
+        <artifactId>derby</artifactId>
+        <version>${org.apache.derby.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>hsqldb</groupId>
+        <artifactId>hsqldb</artifactId>
+        <version>${hsqldb.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>ddlutils</groupId>
+        <artifactId>ddlutils</artifactId>
+        <version>${ddlutils.version}</version>
+      </dependency>
+
+      <!-- LDAP -->
+      <dependency>
+        <groupId>directory</groupId>
+        <artifactId>apacheds-main</artifactId>
+        <version>${directory.version}</version>
+        <exclusions>
+          <exclusion>
+            <groupId>directory-shared</groupId>
+            <artifactId>protocol-common</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>asn1-ber</groupId>
+            <artifactId>asn1-codec</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>directory-shared</groupId>
+            <artifactId>ldap-common</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>directory-shared</groupId>
+            <artifactId>kerberos-common</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>directory-protocols</groupId>
+            <artifactId>ntp-protocol</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>directory-protocols</groupId>
+            <artifactId>changepw-protocol</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>directory-protocols</groupId>
+            <artifactId>kerberos-protocol</artifactId>
+          </exclusion>
+          <exclusion>
+            <groupId>directory-protocols</groupId>
+            <artifactId>ldap-protocol</artifactId>
+          </exclusion>
+        </exclusions>
+      </dependency>
+
+      <!-- Email -->
+      <dependency>
+        <groupId>javax.mail</groupId>
+        <artifactId>mail</artifactId>
+        <version>${javax.mail.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>javax.activation</groupId>
+        <artifactId>activation</artifactId>
+        <version>${javax.activation.version}</version>
+      </dependency>
+
+      <!-- Taglibs -->
+      <dependency>
+        <groupId>javax.servlet</groupId>
+        <artifactId>jstl</artifactId>
+        <version>${javax.servlet.jstl.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>taglibs</groupId>
+        <artifactId>standard</artifactId>
+        <version>${taglibs-standard.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>taglibs</groupId>
+        <artifactId>request</artifactId>
+        <version>${taglibs-request.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>taglibs</groupId>
+        <artifactId>random</artifactId>
+        <version>${taglibs-random.version}</version>
+      </dependency>
+
+      <!-- Velocity -->
+      <dependency>
+        <groupId>velocity</groupId>
+        <artifactId>velocity</artifactId>
+        <version>${velocity.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>velocity-tools</groupId>
+        <artifactId>velocity-tools</artifactId>
+        <version>${velocity-tools.version}</version>
+      </dependency>
+
+      <!-- Portals Bridges -->
+      <dependency>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>portals-bridges-common</artifactId>
+        <version>${org.apache.portals.bridges.common.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>portals-bridges-velocity</artifactId>
+        <version>${org.apache.portals.bridges.velocity.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>portals-bridges-frameworks</artifactId>
+        <version>${org.apache.portals.bridges.frameworks.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>portals-bridges-jsf</artifactId>
+        <version>${org.apache.portals.bridges.jsf.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>portals-bridges-portletfilter</artifactId>
+        <version>${org.apache.portals.bridges.portletfilter.version}</version>
+      </dependency>
+
+      <!-- Portals Bridges Applications -->
+      <dependency>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>jpetstore</artifactId>
+        <type>war</type>
+        <version>${org.apache.portals.bridges.jpetstore.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>org.apache.portals.bridges</groupId>
+        <artifactId>jsf-demo</artifactId>
+        <type>war</type>
+        <version>${org.apache.portals.bridges.jsf-demo.version}</version>
+      </dependency>
+
+      <!-- MyFaces -->
+      <dependency>
+        <groupId>myfaces</groupId>
+        <artifactId>myfaces-api</artifactId>
+        <version>${myfaces.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>myfaces</groupId>
+        <artifactId>myfaces-impl</artifactId>
+        <version>${myfaces.version}</version>
+      </dependency>
+      <dependency>
+        <groupId>myfaces</groupId>
+        <artifactId>tomahawk</artifactId>
+        <version>${myfaces.version}</version>
+      </dependency>
+
+      <!-- Rome -->
+      <dependency>
+        <groupId>rome</groupId>
+        <artifactId>rome</artifactId>
+        <version>${rome.version}</version>
+      </dependency>
+
+      <!-- Ant -->
+      <dependency>
+        <groupId>ant</groupId>
+        <artifactId>ant</artifactId>
+        <version>${ant.version}</version>
+      </dependency>
+
+    </dependencies>
+  </dependencyManagement>
+
+  <dependencies>
+
+    <!-- Provided Dependencies -->
+    <dependency>
+      <groupId>portlet-api</groupId>
+      <artifactId>portlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto</artifactId>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.portals.bridges</groupId>
+      <artifactId>portals-bridges-common</artifactId>
+      <scope>provided</scope>
+    </dependency>
+
+    <!-- Test Dependencies -->
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <scope>test</scope>
+    </dependency>
+
+  </dependencies>
+
+  <!-- Global Build Configuration -->
+
+  <build>
+    <!-- Plugin Configuration -->
+    <pluginManagement>
+      <plugins>
+
+        <!-- Compiler -->
+        <plugin>
+          <groupId>org.apache.maven.plugins</groupId>
+          <artifactId>maven-compiler-plugin</artifactId>
+          <configuration>
+            <source>1.4</source>
+            <target>1.4</target>
+            <debug>true</debug>
+            <showDeprecation>true</showDeprecation>
+            <showWarnings>true</showWarnings>
+            <optimize>false</optimize>
+          </configuration>
+        </plugin>
+      </plugins>
+    </pluginManagement>
+    <plugins>
+      <!-- TODO: the maven-remote-resources-plugin isn't working quite well yet
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-remote-resources-plugin</artifactId>
+        <version>1.0-alpha-4</version>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <resourceBundles>
+                <resourceBundle>org.apache:apache-jar-resource-bundle:1.0</resourceBundle>                    
+              </resourceBundles>
+              <properties>
+                <addLicense>true</addLicense>
+              </properties>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      -->
+    </plugins>        
+    <resources>
+      <resource>
+        <directory>${basedir}/src/main/resources</directory>
+      </resource>
+      <resource>
+        <directory>${basedir}/src/main/java</directory>
+        <includes>
+          <include>**/*.xml</include>
+          <include>**/*.properties</include>
+          <include>**/*.dtd</include>
+          <include>**/*.vm</include>
+        </includes>
+      </resource>
+    </resources>    
+  </build>
+
+  <modules>
+    <module>maven</module>
+    <module>jetspeed-portal-resources</module>
+    <module>jetspeed-api</module>
+    <module>jetspeed-commons</module>
+    <module>components</module>
+  </modules>
+
+</project>

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/jetspeed-2/branches/J2-M2-REDUX/pom.xml
------------------------------------------------------------------------------
    svn:keywords = Id



---------------------------------------------------------------------
To unsubscribe, e-mail: jetspeed-dev-unsubscribe@portals.apache.org
For additional commands, e-mail: jetspeed-dev-help@portals.apache.org