portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r607448 [2/36] - in /portals/pluto/branches/pluto-1.1.x: ./ assembly/src/main/assembly/ assembly/src/main/resources/ maven-pluto-plugin/ maven-pluto-plugin/src/main/java/org/apache/pluto/maven/ pluto-ant-tasks/ pluto-ant-tasks/src/assemble/...
Date Sat, 29 Dec 2007 17:20:42 GMT
Modified: portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AssembleMojo.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AssembleMojo.java?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AssembleMojo.java (original)
+++ portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AssembleMojo.java Sat Dec 29 09:20:23 2007
@@ -1,316 +1,316 @@
-/*
+/*
  * 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.pluto.maven;
-
-import java.io.File;
-import java.util.ArrayList;
-import java.util.Iterator;
-import java.util.List;
-
-import org.apache.maven.plugin.MojoExecutionException;
-import org.apache.maven.plugin.logging.Log;
-import org.apache.pluto.util.UtilityException;
-import org.apache.pluto.util.assemble.Assembler;
-import org.apache.pluto.util.assemble.AssemblerConfig;
-import org.apache.pluto.util.assemble.AssemblerFactory;
-
-/**
- * The AssembleMojo is responsible for assembling a web application for deployment
- * into the Pluto portlet container.  Assembly, in this context, is the process of
- * updating a web application's WEB-INF/web.xml with Pluto specific parameters for 
- * deployment in Pluto.   
- * <p>
- * This Mojo is able to operate on individual descriptors by specifying 
- * <code>portletXml</code>, <code>webXml</code>, and <code>webXmlDestination</code>.
- * If your project uses standard Maven 2 directory layouts, the defaults will
- * provide proper values.
- * <p/>
- * Example Maven 2 <code>pom.xml</code> usage:
- * <pre>
- * &lt;project&gt;
- *   ...
- *   &lt;build&gt;
- *      &lt;plugins&gt;
- *          &lt;plugin&gt;
- *              &lt;groupId&gt;org.apache.pluto&lt;/groupId&gt;
- *              &lt;artifactId&gt;maven-pluto-plugin&lt;/artifactId&gt;
- *          &lt;/plugin&gt;
- *      &lt;/plugins&gt;
- *   &lt;/build&gt;
- *   ...
- * &lt;/project&gt;
- * </pre>
- * <p>
- * This Mojo can also operate on entire WAR or EAR archive files by specifying
- * a list of archive path names in <code>archives</code>.
- * <p/>
- * Example Maven 2 <code>pom.xml</code> usage:
- * <pre>
- * &lt;project&gt;
- *   ...
- *   &lt;build&gt;
- *      &lt;plugins&gt;
- *          &lt;plugin&gt;
- *              &lt;groupId&gt;org.apache.pluto&lt;/groupId&gt;
- *              &lt;artifactId&gt;maven-pluto-plugin&lt;/artifactId&gt;
- *              &lt;executions&gt;
- *                  &lt;execution&gt;
- *                      &lt;phase&gt;package&lt;/phase&gt;
- *                      &lt;goals&gt;
- *                          &lt;goal&gt;assemble&lt;/goal&gt;
- *                      &lt;/goals&gt;
- *                      &lt;configuration&gt;
- *                          &lt;assemblyOutputDirectory&gt;${project.build.directory}/assembled-wars&lt;/assemblyOutputDirectory&gt;
- *                          &lt;archives&gt;
- *                              &lt;assembleArchive&gt;
- *                                  ${project.build.directory}/wartoassemble.war
- *                              &lt;/assembleArchive&gt;
- *                              &lt;assembleArchive&gt;
- *                                  ${project.build.directory}/anotherwartoassemble.war
- *                              &lt;/assembleArchive&gt;
- *                          &lt;/archives&gt;
- *                      &lt;/configuration&gt;
- *                  &lt;/execution&gt;
- *              &lt;/executions&gt;
- *          &lt;/plugin&gt;
- *      &lt;/plugins&gt;
- *   &lt;/build&gt;
- *   ...
- * &lt;/project&gt;
- * </pre>
- * 
- * @since Jul 30, 2005
- * @see org.apache.pluto.util.assemble.Assembler 
- * 
- * @goal assemble
- * @description prepares a web application as a portlet application
- * @phase process-resources
- */
-public class AssembleMojo extends AbstractPortletMojo {
-
-	// Private Member Variables ------------------------------------------------
-
-    /**
-     * The portlet application descriptor (<code>WEB-INF/portlet.xml</code>).
-     * @parameter expression="${basedir}/src/main/webapp/WEB-INF/portlet.xml"
-     * @required
-     */
-    private File portletXml;
-
-    /**
-     * The original webapp descriptor (<code>WEB-INF/web.xml</code>).
-     * @parameter expression="${basedir}/src/main/webapp/WEB-INF/web.xml"
-     * @required
-     */
-    private File webXml;
-
-    /**
-     * The file to which the updated webapp descriptor is written.
-     * @parameter expression="${project.build.directory}/pluto-resources/web.xml"
-     */
-    private File webXmlDestination;
-
-    /**
-     * The name of the dispatch servlet class to use
-     * @parameter
-     */
-    private String dispatchServletClass;
-    
-    /**
-     * A list of archive files to assemble.  Only EAR and WAR file
-     * types are supported.  
-     * <p/>
-     * Each value in the list is the absolute pathname to the 
-     * archive being assembled.
-     * <p/>
-     * This parameter is mutually exclusive with portletXml, webXml, 
-     * and webXmlDestination parameters.  
-     * 
-     * @parameter alias="warFiles"
-     */
-    private List archives;
-
-    /**
-     * @deprecated see archives parameter
-     * @parameter
-     */
-    private List warFiles;
-    
-    /**
-     * Destination directory the assembled files are written out to.
-     * @parameter alias="warFilesDestination" expression="${project.build.directory}/pluto-assembled-wars"
-     */
-    private File assemblyOutputDirectory;
-    
-    /**
-     * Destination directory the assembled files are written out to.
-     * @parameter
-     * @deprecated see assemblyOutputDirectory parameter
-     */
-    private File warFilesDestination;
-
-    // AbstractPlutoMojo Impl --------------------------------------------------
-
-    protected void doExecute() throws MojoExecutionException {       
-        
-        // Log parameter values.
-    	Log log = getLog();
-        if (log.isInfoEnabled()) {
-            if (archives == null || archives.isEmpty()) {
-                log.info("Reading web.xml from :" + webXml.getAbsolutePath());
-                log.info("Reading portlet.xml from: " + portletXml.getAbsolutePath());
-                log.info("Writing web.xml to: " + webXmlDestination.getAbsolutePath());
-            }               
-        }
-        
-        try {
-            // Assemble portlet app by updating web.xml.
-            if (archives == null || archives.isEmpty()) {        
-                AssemblerConfig config = createAssemblerConfig();
-                Assembler assembler = AssemblerFactory.getFactory()
-            		    .createAssembler(config);
-                assembler.assemble(config);
-            } else {
-                for (Iterator i = archives.iterator(); i.hasNext();) {
-                    File archive = new File(i.next().toString());
-                    if (log.isInfoEnabled()) {
-                        log.info("Assembling archive file " + archive.getAbsolutePath() + 
-                                " to directory " + assemblyOutputDirectory.getAbsolutePath());
-                    }                
-                    AssemblerConfig config = createArchiveAssemblerConfig(archive, assemblyOutputDirectory);
-                    Assembler assembler = AssemblerFactory.getFactory()
-                        .createAssembler(config);
-                    assembler.assemble(config);
-                }
-            }
-        } catch (UtilityException e) {
-            log.error("Assembly failed: " + e.getMessage(), e);
-        }
-    }
-
-    protected void doValidate() throws MojoExecutionException {
-        Log log = getLog();
-        
-        // Support for the old 'warFiles' mojo parameter.  Apparently
-        // the alias for the 'archives' parameter doesn't work properly.
-        if (! (warFiles == null || warFiles.isEmpty()) ) {
-            log.warn( "'warFiles' parameter is deprecated.  Use 'archives' parameter instead." );
-            if ( archives == null ) {
-                archives = new ArrayList();
-            }
-            archives.addAll( warFiles );
-        }
-        
-        // Warn if the old 'warFilesDestination' mojo parameter is used
-        if ( warFilesDestination != null ) {
-            log.warn( "'warFilesDestination' parameter is deprecated.  Use 'assemblyOutputDirectory' instead." );
-            assemblyOutputDirectory = warFilesDestination;
-        }
-        
-        // If a list of war files are supplied:
-        //   1) webXml, portletXml, and webXmlDestination parameters are ignored
-        //   2) verify the files in the List exist.
-        //   3) verify the destination is a directory, or create it if it doesn't exist.
-        
-        // A list of files was supplied so we ignore other parameters. 
-        if (archives != null && !archives.isEmpty()) {
-            if (webXml != null) {
-                log.debug("archives parameter and webXml parameter are mutually exclusive.  Ignoring webXml parameter.");
-            }
-            if (portletXml != null) {
-                log.debug("archives parameter and portletXml parameter are mutually exclusive.  Ignoring portletXml parameter.");
-            }
-            if (webXmlDestination != null) {
-                log.debug("archives parameter and webXmlDestination parameter are mutually exclusive.  Ignoring webXmlDestination parameter.");
-            }
-            
-            // verify each file can be found
-            for (Iterator i = archives.iterator(); i.hasNext();) {
-                File f = new File(i.next().toString());
-                if (!f.exists()) {
-                    log.warn("File " + f.getAbsolutePath() + " does not exist.");
-                    i.remove();
-                    continue;
-                }
-                if (!f.canRead()) {
-                    log.warn("File " + f.getAbsolutePath() + " exists but cannot be read.");
-                    i.remove();
-                    continue;
-                }
-            }
-            
-            // check to see if the warFiles list is now empty
-            if (archives.isEmpty()) {
-                throw new MojoExecutionException("No war files could be installed due errors.");
-            }
-             
-            // check to see if the dest dir exists or create it.
-            if (!assemblyOutputDirectory.exists()) {
-                if (log.isDebugEnabled()) {
-                    log.debug("Creating destination directory for assembled war files: " + assemblyOutputDirectory.getAbsolutePath());
-                }
-                try {                    
-                    if(!assemblyOutputDirectory.mkdirs()) {
-                        throw new MojoExecutionException("Unable to create destination directory for assembled war files: " + 
-                                assemblyOutputDirectory.getAbsolutePath());
-                    }                        
-                } catch (SecurityException e) {
-                    throw new MojoExecutionException("Unable to create destination directory for assembled war files: " + e.getMessage(), e);
-                }
-            } else {
-                if (!assemblyOutputDirectory.isDirectory()) {
-                    throw new MojoExecutionException("Specified destination for assembled war files " +
-                            assemblyOutputDirectory.getAbsolutePath() + " is not a directory!");
-                }
-                if (!assemblyOutputDirectory.canRead()||!assemblyOutputDirectory.canWrite()) {
-                    throw new MojoExecutionException("Unable to read or write to destination directory for assembed war files.  " +
-                            "Check permissions on the directory " + assemblyOutputDirectory.getAbsolutePath());
-                }
-            }
-            
-        // A list of archive files was not provided, so use the other parameters instead.
-            
-        } else {            
-            if (webXml == null || !webXml.exists()) {
-                throw new MojoExecutionException("Web application descriptor must be a valid web.xml");
-            }
-            if (portletXml == null || !portletXml.exists()) {
-                throw new MojoExecutionException("Portlet descriptor must be a valid portlet.xml");
-            }
-        }
-    }
-
-    // Private Methods ---------------------------------------------------------
-
-    private AssemblerConfig createAssemblerConfig() {
-        AssemblerConfig config = new AssemblerConfig();
-        config.setPortletDescriptor(portletXml);
-        config.setWebappDescriptor(webXml);
-        config.setDestination(webXmlDestination);
-        config.setDispatchServletClass(dispatchServletClass);
-        return config;
-    }
-    
-    private AssemblerConfig createArchiveAssemblerConfig(File archiveToAssemble, File destinationDirectory) {
-        AssemblerConfig config = new AssemblerConfig();
-        config.setDispatchServletClass(dispatchServletClass);
-        config.setSource(archiveToAssemble);
-        config.setDestination(destinationDirectory);
-        return config;
-    }
-
-}
+ * 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.pluto.maven;
+
+import java.io.File;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.plugin.logging.Log;
+import org.apache.pluto.util.UtilityException;
+import org.apache.pluto.util.assemble.Assembler;
+import org.apache.pluto.util.assemble.AssemblerConfig;
+import org.apache.pluto.util.assemble.AssemblerFactory;
+
+/**
+ * The AssembleMojo is responsible for assembling a web application for deployment
+ * into the Pluto portlet container.  Assembly, in this context, is the process of
+ * updating a web application's WEB-INF/web.xml with Pluto specific parameters for 
+ * deployment in Pluto.   
+ * <p>
+ * This Mojo is able to operate on individual descriptors by specifying 
+ * <code>portletXml</code>, <code>webXml</code>, and <code>webXmlDestination</code>.
+ * If your project uses standard Maven 2 directory layouts, the defaults will
+ * provide proper values.
+ * <p/>
+ * Example Maven 2 <code>pom.xml</code> usage:
+ * <pre>
+ * &lt;project&gt;
+ *   ...
+ *   &lt;build&gt;
+ *      &lt;plugins&gt;
+ *          &lt;plugin&gt;
+ *              &lt;groupId&gt;org.apache.pluto&lt;/groupId&gt;
+ *              &lt;artifactId&gt;maven-pluto-plugin&lt;/artifactId&gt;
+ *          &lt;/plugin&gt;
+ *      &lt;/plugins&gt;
+ *   &lt;/build&gt;
+ *   ...
+ * &lt;/project&gt;
+ * </pre>
+ * <p>
+ * This Mojo can also operate on entire WAR or EAR archive files by specifying
+ * a list of archive path names in <code>archives</code>.
+ * <p/>
+ * Example Maven 2 <code>pom.xml</code> usage:
+ * <pre>
+ * &lt;project&gt;
+ *   ...
+ *   &lt;build&gt;
+ *      &lt;plugins&gt;
+ *          &lt;plugin&gt;
+ *              &lt;groupId&gt;org.apache.pluto&lt;/groupId&gt;
+ *              &lt;artifactId&gt;maven-pluto-plugin&lt;/artifactId&gt;
+ *              &lt;executions&gt;
+ *                  &lt;execution&gt;
+ *                      &lt;phase&gt;package&lt;/phase&gt;
+ *                      &lt;goals&gt;
+ *                          &lt;goal&gt;assemble&lt;/goal&gt;
+ *                      &lt;/goals&gt;
+ *                      &lt;configuration&gt;
+ *                          &lt;assemblyOutputDirectory&gt;${project.build.directory}/assembled-wars&lt;/assemblyOutputDirectory&gt;
+ *                          &lt;archives&gt;
+ *                              &lt;assembleArchive&gt;
+ *                                  ${project.build.directory}/wartoassemble.war
+ *                              &lt;/assembleArchive&gt;
+ *                              &lt;assembleArchive&gt;
+ *                                  ${project.build.directory}/anotherwartoassemble.war
+ *                              &lt;/assembleArchive&gt;
+ *                          &lt;/archives&gt;
+ *                      &lt;/configuration&gt;
+ *                  &lt;/execution&gt;
+ *              &lt;/executions&gt;
+ *          &lt;/plugin&gt;
+ *      &lt;/plugins&gt;
+ *   &lt;/build&gt;
+ *   ...
+ * &lt;/project&gt;
+ * </pre>
+ * 
+ * @since Jul 30, 2005
+ * @see org.apache.pluto.util.assemble.Assembler 
+ * 
+ * @goal assemble
+ * @description prepares a web application as a portlet application
+ * @phase process-resources
+ */
+public class AssembleMojo extends AbstractPortletMojo {
+
+	// Private Member Variables ------------------------------------------------
+
+    /**
+     * The portlet application descriptor (<code>WEB-INF/portlet.xml</code>).
+     * @parameter expression="${basedir}/src/main/webapp/WEB-INF/portlet.xml"
+     * @required
+     */
+    private File portletXml;
+
+    /**
+     * The original webapp descriptor (<code>WEB-INF/web.xml</code>).
+     * @parameter expression="${basedir}/src/main/webapp/WEB-INF/web.xml"
+     * @required
+     */
+    private File webXml;
+
+    /**
+     * The file to which the updated webapp descriptor is written.
+     * @parameter expression="${project.build.directory}/pluto-resources/web.xml"
+     */
+    private File webXmlDestination;
+
+    /**
+     * The name of the dispatch servlet class to use
+     * @parameter
+     */
+    private String dispatchServletClass;
+    
+    /**
+     * A list of archive files to assemble.  Only EAR and WAR file
+     * types are supported.  
+     * <p/>
+     * Each value in the list is the absolute pathname to the 
+     * archive being assembled.
+     * <p/>
+     * This parameter is mutually exclusive with portletXml, webXml, 
+     * and webXmlDestination parameters.  
+     * 
+     * @parameter alias="warFiles"
+     */
+    private List archives;
+
+    /**
+     * @deprecated see archives parameter
+     * @parameter
+     */
+    private List warFiles;
+    
+    /**
+     * Destination directory the assembled files are written out to.
+     * @parameter alias="warFilesDestination" expression="${project.build.directory}/pluto-assembled-wars"
+     */
+    private File assemblyOutputDirectory;
+    
+    /**
+     * Destination directory the assembled files are written out to.
+     * @parameter
+     * @deprecated see assemblyOutputDirectory parameter
+     */
+    private File warFilesDestination;
+
+    // AbstractPlutoMojo Impl --------------------------------------------------
+
+    protected void doExecute() throws MojoExecutionException {       
+        
+        // Log parameter values.
+    	Log log = getLog();
+        if (log.isInfoEnabled()) {
+            if (archives == null || archives.isEmpty()) {
+                log.info("Reading web.xml from :" + webXml.getAbsolutePath());
+                log.info("Reading portlet.xml from: " + portletXml.getAbsolutePath());
+                log.info("Writing web.xml to: " + webXmlDestination.getAbsolutePath());
+            }               
+        }
+        
+        try {
+            // Assemble portlet app by updating web.xml.
+            if (archives == null || archives.isEmpty()) {        
+                AssemblerConfig config = createAssemblerConfig();
+                Assembler assembler = AssemblerFactory.getFactory()
+            		    .createAssembler(config);
+                assembler.assemble(config);
+            } else {
+                for (Iterator i = archives.iterator(); i.hasNext();) {
+                    File archive = new File(i.next().toString());
+                    if (log.isInfoEnabled()) {
+                        log.info("Assembling archive file " + archive.getAbsolutePath() + 
+                                " to directory " + assemblyOutputDirectory.getAbsolutePath());
+                    }                
+                    AssemblerConfig config = createArchiveAssemblerConfig(archive, assemblyOutputDirectory);
+                    Assembler assembler = AssemblerFactory.getFactory()
+                        .createAssembler(config);
+                    assembler.assemble(config);
+                }
+            }
+        } catch (UtilityException e) {
+            log.error("Assembly failed: " + e.getMessage(), e);
+        }
+    }
+
+    protected void doValidate() throws MojoExecutionException {
+        Log log = getLog();
+        
+        // Support for the old 'warFiles' mojo parameter.  Apparently
+        // the alias for the 'archives' parameter doesn't work properly.
+        if (! (warFiles == null || warFiles.isEmpty()) ) {
+            log.warn( "'warFiles' parameter is deprecated.  Use 'archives' parameter instead." );
+            if ( archives == null ) {
+                archives = new ArrayList();
+            }
+            archives.addAll( warFiles );
+        }
+        
+        // Warn if the old 'warFilesDestination' mojo parameter is used
+        if ( warFilesDestination != null ) {
+            log.warn( "'warFilesDestination' parameter is deprecated.  Use 'assemblyOutputDirectory' instead." );
+            assemblyOutputDirectory = warFilesDestination;
+        }
+        
+        // If a list of war files are supplied:
+        //   1) webXml, portletXml, and webXmlDestination parameters are ignored
+        //   2) verify the files in the List exist.
+        //   3) verify the destination is a directory, or create it if it doesn't exist.
+        
+        // A list of files was supplied so we ignore other parameters. 
+        if (archives != null && !archives.isEmpty()) {
+            if (webXml != null) {
+                log.debug("archives parameter and webXml parameter are mutually exclusive.  Ignoring webXml parameter.");
+            }
+            if (portletXml != null) {
+                log.debug("archives parameter and portletXml parameter are mutually exclusive.  Ignoring portletXml parameter.");
+            }
+            if (webXmlDestination != null) {
+                log.debug("archives parameter and webXmlDestination parameter are mutually exclusive.  Ignoring webXmlDestination parameter.");
+            }
+            
+            // verify each file can be found
+            for (Iterator i = archives.iterator(); i.hasNext();) {
+                File f = new File(i.next().toString());
+                if (!f.exists()) {
+                    log.warn("File " + f.getAbsolutePath() + " does not exist.");
+                    i.remove();
+                    continue;
+                }
+                if (!f.canRead()) {
+                    log.warn("File " + f.getAbsolutePath() + " exists but cannot be read.");
+                    i.remove();
+                    continue;
+                }
+            }
+            
+            // check to see if the warFiles list is now empty
+            if (archives.isEmpty()) {
+                throw new MojoExecutionException("No war files could be installed due errors.");
+            }
+             
+            // check to see if the dest dir exists or create it.
+            if (!assemblyOutputDirectory.exists()) {
+                if (log.isDebugEnabled()) {
+                    log.debug("Creating destination directory for assembled war files: " + assemblyOutputDirectory.getAbsolutePath());
+                }
+                try {                    
+                    if(!assemblyOutputDirectory.mkdirs()) {
+                        throw new MojoExecutionException("Unable to create destination directory for assembled war files: " + 
+                                assemblyOutputDirectory.getAbsolutePath());
+                    }                        
+                } catch (SecurityException e) {
+                    throw new MojoExecutionException("Unable to create destination directory for assembled war files: " + e.getMessage(), e);
+                }
+            } else {
+                if (!assemblyOutputDirectory.isDirectory()) {
+                    throw new MojoExecutionException("Specified destination for assembled war files " +
+                            assemblyOutputDirectory.getAbsolutePath() + " is not a directory!");
+                }
+                if (!assemblyOutputDirectory.canRead()||!assemblyOutputDirectory.canWrite()) {
+                    throw new MojoExecutionException("Unable to read or write to destination directory for assembed war files.  " +
+                            "Check permissions on the directory " + assemblyOutputDirectory.getAbsolutePath());
+                }
+            }
+            
+        // A list of archive files was not provided, so use the other parameters instead.
+            
+        } else {            
+            if (webXml == null || !webXml.exists()) {
+                throw new MojoExecutionException("Web application descriptor must be a valid web.xml");
+            }
+            if (portletXml == null || !portletXml.exists()) {
+                throw new MojoExecutionException("Portlet descriptor must be a valid portlet.xml");
+            }
+        }
+    }
+
+    // Private Methods ---------------------------------------------------------
+
+    private AssemblerConfig createAssemblerConfig() {
+        AssemblerConfig config = new AssemblerConfig();
+        config.setPortletDescriptor(portletXml);
+        config.setWebappDescriptor(webXml);
+        config.setDestination(webXmlDestination);
+        config.setDispatchServletClass(dispatchServletClass);
+        return config;
+    }
+    
+    private AssemblerConfig createArchiveAssemblerConfig(File archiveToAssemble, File destinationDirectory) {
+        AssemblerConfig config = new AssemblerConfig();
+        config.setDispatchServletClass(dispatchServletClass);
+        config.setSource(archiveToAssemble);
+        config.setDestination(destinationDirectory);
+        return config;
+    }
+
+}

Propchange: portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/AssembleMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallMojo.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallMojo.java?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallMojo.java (original)
+++ portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallMojo.java Sat Dec 29 09:20:23 2007
@@ -1,30 +1,30 @@
-/*
+/*
  * 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.pluto.maven;
-
-/**
- * @goal install
- * @description the pluto ApplicationServerHook goal installs the pluto portal into the specified application server
- * @requiresDependencyResolution runtime
- *
- */
-public class InstallMojo extends AbstractManagementMojo {
-
-    protected void doExecute() throws Exception {
-        getHandler().install(createInstallationConfig());
-    }
-}
+ * 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.pluto.maven;
+
+/**
+ * @goal install
+ * @description the pluto ApplicationServerHook goal installs the pluto portal into the specified application server
+ * @requiresDependencyResolution runtime
+ *
+ */
+public class InstallMojo extends AbstractManagementMojo {
+
+    protected void doExecute() throws Exception {
+        getHandler().install(createInstallationConfig());
+    }
+}

Propchange: portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java (original)
+++ portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java Sat Dec 29 09:20:23 2007
@@ -1,168 +1,168 @@
-/*
+/*
  * 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.pluto.maven;
-
-import java.io.IOException;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Collections;
-import java.util.List;
-import java.util.Properties;
-
-/**
- *
- */
-class InstallationDependency {    
-    
-    private static final Properties VERSION_PROPERTIES = new Properties();
-    private static final String PROPERTIES_FILE = "/versions.properties";
-    static
-    {
-        try 
-        {
-            VERSION_PROPERTIES.load(InstallationDependency.class.getResourceAsStream(PROPERTIES_FILE));
-        } 
-        catch (IOException e) 
-        {
-            throw new RuntimeException("Cannot load " + PROPERTIES_FILE + " from the classpath!", e);
-        }
-    }
-
-    public static final InstallationDependency PORTLET_API =
-        new InstallationDependency("javax.portlet", "portlet-api", 
-                VERSION_PROPERTIES.getProperty("portlet-api.version"));
-
-    public static final InstallationDependency  DESCRIPTOR_API =
-        new InstallationDependency("org.apache.pluto", "pluto-descriptor-api", 
-                VERSION_PROPERTIES.getProperty("pluto.version"));
-
-    public static final InstallationDependency  DESCRIPTOR_IMPL =
-            new InstallationDependency("org.apache.pluto", "pluto-descriptor-impl", 
-                    VERSION_PROPERTIES.getProperty("pluto.version"));
-
-    public static final InstallationDependency  CONTAINER =
-            new InstallationDependency("org.apache.pluto", "pluto-container", 
-                    VERSION_PROPERTIES.getProperty("pluto.version"));
-
-    public static final InstallationDependency  TAGLIB =
-            new InstallationDependency("org.apache.pluto", "pluto-taglib", 
-                    VERSION_PROPERTIES.getProperty("pluto.version"));
-
-    public static final InstallationDependency  PORTAL =
-            new InstallationDependency("org.apache.pluto", "pluto-portal", 
-                    VERSION_PROPERTIES.getProperty("pluto.version"), "war");
-
-    public static final InstallationDependency  TESTSUITE =
-            new InstallationDependency("org.apache.pluto", "pluto-testsuite", 
-                    VERSION_PROPERTIES.getProperty("pluto.version"), "war");
-
-    public static final InstallationDependency  CASTOR =
-            new InstallationDependency("org.codehaus.castor", "castor", 
-                    VERSION_PROPERTIES.getProperty("castor.version"));
-
-    public static final InstallationDependency  COMMONS_LOGGING_API =
-        new InstallationDependency("commons-logging", "commons-logging-api",
-                VERSION_PROPERTIES.getProperty("commons-logging.version"));
-    
-    public static final InstallationDependency  XERCES =
-            new InstallationDependency("xerces", "xercesImpl", 
-                    VERSION_PROPERTIES.getProperty("xercesImpl.version"));
-
-    public static final InstallationDependency  XML_PARSER_APIS =
-            new InstallationDependency("xerces", "xmlParserAPIs", 
-                    VERSION_PROPERTIES.getProperty("xmlParserAPIs.version"));
-
-    private static final List ENDORSED = new ArrayList();
-    private static final List SHARED = new ArrayList();
-
-    static {
-        ENDORSED.add(XERCES);
-        ENDORSED.add(XML_PARSER_APIS);
-
-        SHARED.add(PORTLET_API);
-        SHARED.add(DESCRIPTOR_API);
-        SHARED.add(DESCRIPTOR_IMPL);
-        SHARED.add(CONTAINER);
-        SHARED.add(TAGLIB);
-        SHARED.add(CASTOR);
-        SHARED.add(COMMONS_LOGGING_API);        
-    }    
-
-    public static Collection getEndorsedDependencies() {
-        return Collections.unmodifiableCollection(ENDORSED);
-    }
-
-    public static Collection getSharedDependencies() {
-        return Collections.unmodifiableCollection(SHARED);
-    }
-
-    private String groupId;
-    private String artifactId;
-    private String version;
-    private String type;
-
-    public InstallationDependency(String groupId, String artifactId, String version) {
-        this(groupId, artifactId, version, "jar");
-    }
-
-    public InstallationDependency(String groupId, String artifactId, String version, String type) {
-        if (version == null || version.trim().equalsIgnoreCase(""))
-        {
-            throw new RuntimeException("Missing or invalid property for artifact " + 
-                    artifactId + " in " + PROPERTIES_FILE + "!");
-        }
-        
-        this.groupId = groupId;
-        this.artifactId = artifactId;
-        this.version = version;
-        this.type = type;
-    }
-
-
-    public String getGroupId() {
-        return groupId;
-    }
-
-    public void setGroupId(String groupId) {
-        this.groupId = groupId;
-    }
-
-    public String getArtifactId() {
-        return artifactId;
-    }
-
-    public void setArtifactId(String artifactId) {
-        this.artifactId = artifactId;
-    }
-
-    public String getVersion() {
-        return version;
-    }
-
-    public void setVersion(String version) {
-        this.version = version;
-    }
-
-    public String getType() {
-        return type;
-    }
-
-    public void setType(String type) {
-        this.type = type;
-    }
-    
-}
+ * 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.pluto.maven;
+
+import java.io.IOException;
+import java.util.ArrayList;
+import java.util.Collection;
+import java.util.Collections;
+import java.util.List;
+import java.util.Properties;
+
+/**
+ *
+ */
+class InstallationDependency {    
+    
+    private static final Properties VERSION_PROPERTIES = new Properties();
+    private static final String PROPERTIES_FILE = "/versions.properties";
+    static
+    {
+        try 
+        {
+            VERSION_PROPERTIES.load(InstallationDependency.class.getResourceAsStream(PROPERTIES_FILE));
+        } 
+        catch (IOException e) 
+        {
+            throw new RuntimeException("Cannot load " + PROPERTIES_FILE + " from the classpath!", e);
+        }
+    }
+
+    public static final InstallationDependency PORTLET_API =
+        new InstallationDependency("javax.portlet", "portlet-api", 
+                VERSION_PROPERTIES.getProperty("portlet-api.version"));
+
+    public static final InstallationDependency  DESCRIPTOR_API =
+        new InstallationDependency("org.apache.pluto", "pluto-descriptor-api", 
+                VERSION_PROPERTIES.getProperty("pluto.version"));
+
+    public static final InstallationDependency  DESCRIPTOR_IMPL =
+            new InstallationDependency("org.apache.pluto", "pluto-descriptor-impl", 
+                    VERSION_PROPERTIES.getProperty("pluto.version"));
+
+    public static final InstallationDependency  CONTAINER =
+            new InstallationDependency("org.apache.pluto", "pluto-container", 
+                    VERSION_PROPERTIES.getProperty("pluto.version"));
+
+    public static final InstallationDependency  TAGLIB =
+            new InstallationDependency("org.apache.pluto", "pluto-taglib", 
+                    VERSION_PROPERTIES.getProperty("pluto.version"));
+
+    public static final InstallationDependency  PORTAL =
+            new InstallationDependency("org.apache.pluto", "pluto-portal", 
+                    VERSION_PROPERTIES.getProperty("pluto.version"), "war");
+
+    public static final InstallationDependency  TESTSUITE =
+            new InstallationDependency("org.apache.pluto", "pluto-testsuite", 
+                    VERSION_PROPERTIES.getProperty("pluto.version"), "war");
+
+    public static final InstallationDependency  CASTOR =
+            new InstallationDependency("org.codehaus.castor", "castor", 
+                    VERSION_PROPERTIES.getProperty("castor.version"));
+
+    public static final InstallationDependency  COMMONS_LOGGING_API =
+        new InstallationDependency("commons-logging", "commons-logging-api",
+                VERSION_PROPERTIES.getProperty("commons-logging.version"));
+    
+    public static final InstallationDependency  XERCES =
+            new InstallationDependency("xerces", "xercesImpl", 
+                    VERSION_PROPERTIES.getProperty("xercesImpl.version"));
+
+    public static final InstallationDependency  XML_PARSER_APIS =
+            new InstallationDependency("xerces", "xmlParserAPIs", 
+                    VERSION_PROPERTIES.getProperty("xmlParserAPIs.version"));
+
+    private static final List ENDORSED = new ArrayList();
+    private static final List SHARED = new ArrayList();
+
+    static {
+        ENDORSED.add(XERCES);
+        ENDORSED.add(XML_PARSER_APIS);
+
+        SHARED.add(PORTLET_API);
+        SHARED.add(DESCRIPTOR_API);
+        SHARED.add(DESCRIPTOR_IMPL);
+        SHARED.add(CONTAINER);
+        SHARED.add(TAGLIB);
+        SHARED.add(CASTOR);
+        SHARED.add(COMMONS_LOGGING_API);        
+    }    
+
+    public static Collection getEndorsedDependencies() {
+        return Collections.unmodifiableCollection(ENDORSED);
+    }
+
+    public static Collection getSharedDependencies() {
+        return Collections.unmodifiableCollection(SHARED);
+    }
+
+    private String groupId;
+    private String artifactId;
+    private String version;
+    private String type;
+
+    public InstallationDependency(String groupId, String artifactId, String version) {
+        this(groupId, artifactId, version, "jar");
+    }
+
+    public InstallationDependency(String groupId, String artifactId, String version, String type) {
+        if (version == null || version.trim().equalsIgnoreCase(""))
+        {
+            throw new RuntimeException("Missing or invalid property for artifact " + 
+                    artifactId + " in " + PROPERTIES_FILE + "!");
+        }
+        
+        this.groupId = groupId;
+        this.artifactId = artifactId;
+        this.version = version;
+        this.type = type;
+    }
+
+
+    public String getGroupId() {
+        return groupId;
+    }
+
+    public void setGroupId(String groupId) {
+        this.groupId = groupId;
+    }
+
+    public String getArtifactId() {
+        return artifactId;
+    }
+
+    public void setArtifactId(String artifactId) {
+        this.artifactId = artifactId;
+    }
+
+    public String getVersion() {
+        return version;
+    }
+
+    public void setVersion(String version) {
+        this.version = version;
+    }
+
+    public String getType() {
+        return type;
+    }
+
+    public void setType(String type) {
+        this.type = type;
+    }
+    
+}

Propchange: portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/InstallationDependency.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/ReinstallMojo.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/ReinstallMojo.java?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/ReinstallMojo.java (original)
+++ portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/ReinstallMojo.java Sat Dec 29 09:20:23 2007
@@ -1,37 +1,37 @@
-/*
+/*
  * 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.pluto.maven;
-
-import org.apache.pluto.util.install.InstallationConfig;
-
-
-/**
- * @goal reinstall
- * @requiresDependencyResolution runtime
- */
-public class ReinstallMojo extends AbstractManagementMojo {
-
-    public ReinstallMojo() {
-
-    }
-
-    protected void doExecute() throws Exception {
-        InstallationConfig config = createInstallationConfig();
-        getHandler().uninstall(config);
-        getHandler().install(config);
-    }
-}
+ * 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.pluto.maven;
+
+import org.apache.pluto.util.install.InstallationConfig;
+
+
+/**
+ * @goal reinstall
+ * @requiresDependencyResolution runtime
+ */
+public class ReinstallMojo extends AbstractManagementMojo {
+
+    public ReinstallMojo() {
+
+    }
+
+    protected void doExecute() throws Exception {
+        InstallationConfig config = createInstallationConfig();
+        getHandler().uninstall(config);
+        getHandler().install(config);
+    }
+}

Propchange: portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/ReinstallMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/UninstallMojo.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/UninstallMojo.java?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/UninstallMojo.java (original)
+++ portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/UninstallMojo.java Sat Dec 29 09:20:23 2007
@@ -1,28 +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.
- */
-package org.apache.pluto.maven;
-
-/**
- * @goal uninstall
- * @requiresDependencyResolution runtime
- */
-public class UninstallMojo extends AbstractManagementMojo {
-
-    protected void doExecute() throws Exception {
-        getHandler().uninstall(createInstallationConfig());
-   }
-}
+ * 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.pluto.maven;
+
+/**
+ * @goal uninstall
+ * @requiresDependencyResolution runtime
+ */
+public class UninstallMojo extends AbstractManagementMojo {
+
+    protected void doExecute() throws Exception {
+        getHandler().uninstall(createInstallationConfig());
+   }
+}

Propchange: portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/src/main/java/org/apache/pluto/maven/UninstallMojo.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/assemble/bin.xml?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/assemble/bin.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/assemble/bin.xml Sat Dec 29 09:20:23 2007
@@ -1,56 +1,56 @@
-<!--
+<!--
   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.
--->
-<assembly>
-  <id>bin</id>
-  <formats>
-    <format>tar.gz</format>
-    <format>tar.bz2</format>
-    <format>zip</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-      <directory>../</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>README*</include>
-		<include>LICENSE*</include>
-		<include>NOTICE*</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>target</directory>
-	  <outputDirectory></outputDirectory>
-      <includes>
-        <include>*.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>target/site</directory>
-	  <outputDirectory>docs</outputDirectory>
-      <includes>
-        <include>**/*.*</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-	  <outputDirectory>lib</outputDirectory>
-      <scope>runtime</scope>
-    </dependencySet>
-  </dependencySets>
-</assembly>
-
+  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.
+-->
+<assembly>
+  <id>bin</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>tar.bz2</format>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>../</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>README*</include>
+		<include>LICENSE*</include>
+		<include>NOTICE*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+	  <outputDirectory></outputDirectory>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target/site</directory>
+	  <outputDirectory>docs</outputDirectory>
+      <includes>
+        <include>**/*.*</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+	  <outputDirectory>lib</outputDirectory>
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
+</assembly>
+

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/assemble/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/assemble/src.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/assemble/src.xml?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/assemble/src.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/assemble/src.xml Sat Dec 29 09:20:23 2007
@@ -1,37 +1,37 @@
-<!--
+<!--
   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.
--->
-<assembly>
-  <id>src</id>
-  <formats>
-    <format>tar.gz</format>
-    <format>tar.bz2</format>
-    <format>zip</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-      <includes>
-        <include>README*</include>
-        <include>LICENSE*</include>
-        <include>NOTICE*</include>
-        <include>pom.xml</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>src</directory>
-    </fileSet>
-  </fileSets>
-</assembly>
+  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.
+-->
+<assembly>
+  <id>src</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>tar.bz2</format>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <includes>
+        <include>README*</include>
+        <include>LICENSE*</include>
+        <include>NOTICE*</include>
+        <include>pom.xml</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>src</directory>
+    </fileSet>
+  </fileSets>
+</assembly>

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/assemble/src.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/main/java/org/apache/pluto/ant/AssembleTask.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/main/java/org/apache/pluto/ant/AssembleTask.java?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/main/java/org/apache/pluto/ant/AssembleTask.java (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/main/java/org/apache/pluto/ant/AssembleTask.java Sat Dec 29 09:20:23 2007
@@ -1,316 +1,316 @@
-/*
+/*
  * 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.pluto.ant;
-
-import java.io.File;
-import java.util.Collection;
-import java.util.Iterator;
-import java.util.LinkedList;
-
-import org.apache.pluto.util.UtilityException;
-import org.apache.pluto.util.assemble.Assembler;
-import org.apache.pluto.util.assemble.AssemblerConfig;
-import org.apache.pluto.util.assemble.AssemblerFactory;
-import org.apache.tools.ant.BuildException;
-import org.apache.tools.ant.DirectoryScanner;
-import org.apache.tools.ant.Task;
-import org.apache.tools.ant.types.FileSet;
-
-/**
- * TODO JavaDoc
- *
- * @version 1.0
- * @since Nov 23, 2005
- */
-public class AssembleTask extends Task {
-    
-    /**
-     * Path to the portlet descriptor 
-     * (normally <code>WEB-INF/portlet.xml</code>)
-     * <p/>
-     * If <code>webapp</code> is specified, this File will
-     * be resolved relative to <code>webapp</code>
-     */
-    private File portletxml;
-
-    /**
-     * Path to the unassembled servlet descriptor 
-     * (normally <code>WEB-INF/web.xml</code>)
-     * <p/>
-     * If <code>webapp</code> is specified, this File will
-     * be resolved relative to <code>webapp</code>
-     */
-    private File webxml;
-
-    /**
-     * Path the assembled servlet descriptor will
-     * be written to.
-     */
-    private File destfile;
-
-    /** 
-     * The base directory of the exploded web application to assemble.
-     * If set, <code>webXml</code> and <code>portletXml</code>
-     * will be resolved relative to this directory.
-     */
-    private File webapp;
-
-    /**
-     * Path to the archive to assemble.  EAR and WAR 
-     * packaging formats are supported.
-     */
-    private File archive;
-
-    /**
-     * Destination directory the assembled archives
-     * are written out to.
-     */
-    private File destdir;
-
-    private final Collection archiveFileSets = new LinkedList();
-
-    public File getPortletxml() {
-        if(webapp != null)
-            return new File(webapp, "WEB-INF/portlet.xml");
-        return portletxml;
-    }
-
-    public void setPortletxml(File portletxml) {
-        this.portletxml = portletxml;
-    }
-
-    public File getWebxml() {
-        if(webapp != null)
-            return new File(webapp, "WEB-INF/web.xml");
-        return webxml;
-    }
-
-    public void setWebxml(File webxml) {
-        this.webxml = webxml;
-    }
-
-    public File getDestfile() {
-        if(destfile != null)
-            return destfile;
-        return getWebxml();
-    }
-
-    public void setDestfile(File destfile) {
-        this.destfile = destfile;
-    }
-
-    public File getWebapp() {
-        return webapp;
-    }
-
-    public void setWebapp(File webapp) {
-        this.webapp = webapp;
-    }
-
-    /**
-     * Note this methods remains to support
-     * backwards compatiblity.
-     * 
-     * @deprecated see <code>getArchive()</code>
-     */
-    public File getWar() {
-        return this.archive;
-    }
-
-    /**
-     * Note this methods remains to support
-     * backwards compatiblity.
-     * 
-     * @param war
-     * @deprecated see <code>setArchive(File)</code>
-     */
-    public void setWar(File war) {
-        this.archive = war;
-    }
-    
-    public File getArchive() {
-        return this.archive;
-    }
-    
-    public void setArchive(File archive) {
-        this.archive = archive;
-    }
-
-    public File getDestdir() {
-        if (destdir == null) {
-            return (archive != null ? archive.getParentFile() : null);
-        }
-        return this.destdir;
-    }
-
-    public void setDestdir(File destDir) {
-        this.destdir = destDir;
-    }
-
-    /**
-     * Note this method remains to support 
-     * backwards compatiblity.
-     * 
-     * @param fileSet
-     * @deprecated use addArchives instead
-     */
-    public void addWars(FileSet fileSet) {
-        this.archiveFileSets.add(fileSet);
-    }
-    
-    public void addArchives(FileSet fileSet) {
-        this.archiveFileSets.add(fileSet);
-    }
-
-    public void execute() throws BuildException {
-
-        validateArgs();
-
-        try {
-            if (this.archiveFileSets.size() > 0) {
-                for (final Iterator fileSetItr = this.archiveFileSets.iterator(); fileSetItr.hasNext();) {
-                    final FileSet fileSet = (FileSet)fileSetItr.next();
-                    final DirectoryScanner directoryScanner = fileSet.getDirectoryScanner(this.getProject());
-
-                    final File basedir = directoryScanner.getBasedir();
-                    final String[] includedFiles = directoryScanner.getIncludedFiles();
-
-                    for (int index = 0; index < includedFiles.length; index++) {
-                        AssemblerConfig config = new AssemblerConfig();
-
-                        final File archiveSource = new File(basedir, includedFiles[index]);
-                        config.setSource(archiveSource);
-                        config.setDestination(getDestdir());
-
-                        this.log("Assembling '" + archiveSource + "' to '" + getDestdir() + "'");
-                        Assembler assembler = AssemblerFactory.getFactory().createAssembler(config);
-                        assembler.assemble(config);
-                    }
-                }
-            }
-            else {
-                AssemblerConfig config = new AssemblerConfig();
-
-                final File archiveSource = getArchive();
-                if (archiveSource != null) {
-                    config.setSource(archiveSource);
-                    config.setDestination(getDestdir());
-                    this.log("Assembling '" + archiveSource + "' to '" + getDestdir() + "'");
-                }
-                else {
-                    config.setPortletDescriptor(getPortletxml());
-                    config.setWebappDescriptor(getWebxml());
-                    config.setDestination(getDestfile());
-                    this.log("Assembling '" + getWebxml() + "' to '" + getDestfile() + "'");
-                }
-
-                Assembler assembler = AssemblerFactory.getFactory().createAssembler(config);
-                assembler.assemble(config);
-            }
-        }
-
-        catch(UtilityException ue) {
-            throw new BuildException(ue);
-        }
-    }
-
-    private void validateArgs() throws BuildException {
-        //Check if running with webapp arg
-        if(webapp != null) {
-            if(!webapp.exists()) {
-               throw new BuildException("webapp "+webapp.getAbsolutePath()+ " does not exist");
-            }
-
-            if (archive != null) {
-                throw new BuildException("archive (or war) should not be specified if webapp is specified");
-            }
-            if (this.archiveFileSets.size() > 0) {
-                throw new BuildException("archive (or wars) should not be specified if webapp is specified");
-            }
-            // TODO check this
-            if (destdir != null) {
-                throw new BuildException("destfile should not be specified if webapp is specified");
-            }
-
-            return;
-        }
-
-        //Check if running with war arg
-        if (archive != null) {
-            if(!archive.exists()) {
-                throw new BuildException("Archive file "+archive.getAbsolutePath()+ " does not exist");
-            }
-
-            if (this.archiveFileSets.size() > 0) {
-                throw new BuildException("archives (or wars) should not be specified if archive (or war) is specified");
-            }
-            if (webapp != null) {
-                throw new BuildException("webapp should not be specified if archive (or war) is specified");
-            }
-            if (destfile != null) {
-                throw new BuildException("destfile should not be specified if archive (or war) is specified");
-            }
-            if (portletxml != null) {
-                throw new BuildException("portletxml should not be specified if archive (or war) is specified");
-            }
-            if (webxml != null) {
-                throw new BuildException("webxml should not be specified if archive (or war) is specified");
-            }
-
-            return;
-        }
-
-        //Check if running with archives or wars arg
-        if (this.archiveFileSets.size() > 0) {
-            if (archive != null) {
-                throw new BuildException("archives (or wars) should not be specified if archive (or war) is specified");
-            }
-            if (webapp != null) {
-                throw new BuildException("webapp should not be specified if archives (or wars) is specified");
-            }
-            if (destfile != null) {
-                throw new BuildException("destfile should not be specified if archives (or wars) is specified");
-            }
-            if (portletxml != null) {
-                throw new BuildException("portletxml should not be specified if archive (or wars) is specified");
-            }
-            if (webxml != null) {
-                throw new BuildException("webxml should not be specified if archives (or wars) is specified");
-            }
-
-            return;
-        }
-
-        //Check if running with portletxml && webxml args
-        if(portletxml == null || !portletxml.exists()) {
-            throw new BuildException("portletxml "+portletxml+" does not exist");
-        }
-        if(webxml == null || !webxml.exists()) {
-            throw new BuildException("webxml "+webxml + " does not exist");
-        }
-        if (archive != null) {
-            throw new BuildException("archive (or war) should not be specified if portletxml and webxml are specified");
-        }
-        if (this.archiveFileSets.size() > 0) {
-            throw new BuildException("archives (or wars) should not be specified if portletxml and webxml are specified");
-        }
-        if (destdir != null) {
-            // TODO check this
-            throw new BuildException("destfile should not be specified if portletxml and webxml are aspecified");
-        }
-    }
-}
+ * 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.pluto.ant;
+
+import java.io.File;
+import java.util.Collection;
+import java.util.Iterator;
+import java.util.LinkedList;
+
+import org.apache.pluto.util.UtilityException;
+import org.apache.pluto.util.assemble.Assembler;
+import org.apache.pluto.util.assemble.AssemblerConfig;
+import org.apache.pluto.util.assemble.AssemblerFactory;
+import org.apache.tools.ant.BuildException;
+import org.apache.tools.ant.DirectoryScanner;
+import org.apache.tools.ant.Task;
+import org.apache.tools.ant.types.FileSet;
+
+/**
+ * TODO JavaDoc
+ *
+ * @version 1.0
+ * @since Nov 23, 2005
+ */
+public class AssembleTask extends Task {
+    
+    /**
+     * Path to the portlet descriptor 
+     * (normally <code>WEB-INF/portlet.xml</code>)
+     * <p/>
+     * If <code>webapp</code> is specified, this File will
+     * be resolved relative to <code>webapp</code>
+     */
+    private File portletxml;
+
+    /**
+     * Path to the unassembled servlet descriptor 
+     * (normally <code>WEB-INF/web.xml</code>)
+     * <p/>
+     * If <code>webapp</code> is specified, this File will
+     * be resolved relative to <code>webapp</code>
+     */
+    private File webxml;
+
+    /**
+     * Path the assembled servlet descriptor will
+     * be written to.
+     */
+    private File destfile;
+
+    /** 
+     * The base directory of the exploded web application to assemble.
+     * If set, <code>webXml</code> and <code>portletXml</code>
+     * will be resolved relative to this directory.
+     */
+    private File webapp;
+
+    /**
+     * Path to the archive to assemble.  EAR and WAR 
+     * packaging formats are supported.
+     */
+    private File archive;
+
+    /**
+     * Destination directory the assembled archives
+     * are written out to.
+     */
+    private File destdir;
+
+    private final Collection archiveFileSets = new LinkedList();
+
+    public File getPortletxml() {
+        if(webapp != null)
+            return new File(webapp, "WEB-INF/portlet.xml");
+        return portletxml;
+    }
+
+    public void setPortletxml(File portletxml) {
+        this.portletxml = portletxml;
+    }
+
+    public File getWebxml() {
+        if(webapp != null)
+            return new File(webapp, "WEB-INF/web.xml");
+        return webxml;
+    }
+
+    public void setWebxml(File webxml) {
+        this.webxml = webxml;
+    }
+
+    public File getDestfile() {
+        if(destfile != null)
+            return destfile;
+        return getWebxml();
+    }
+
+    public void setDestfile(File destfile) {
+        this.destfile = destfile;
+    }
+
+    public File getWebapp() {
+        return webapp;
+    }
+
+    public void setWebapp(File webapp) {
+        this.webapp = webapp;
+    }
+
+    /**
+     * Note this methods remains to support
+     * backwards compatiblity.
+     * 
+     * @deprecated see <code>getArchive()</code>
+     */
+    public File getWar() {
+        return this.archive;
+    }
+
+    /**
+     * Note this methods remains to support
+     * backwards compatiblity.
+     * 
+     * @param war
+     * @deprecated see <code>setArchive(File)</code>
+     */
+    public void setWar(File war) {
+        this.archive = war;
+    }
+    
+    public File getArchive() {
+        return this.archive;
+    }
+    
+    public void setArchive(File archive) {
+        this.archive = archive;
+    }
+
+    public File getDestdir() {
+        if (destdir == null) {
+            return (archive != null ? archive.getParentFile() : null);
+        }
+        return this.destdir;
+    }
+
+    public void setDestdir(File destDir) {
+        this.destdir = destDir;
+    }
+
+    /**
+     * Note this method remains to support 
+     * backwards compatiblity.
+     * 
+     * @param fileSet
+     * @deprecated use addArchives instead
+     */
+    public void addWars(FileSet fileSet) {
+        this.archiveFileSets.add(fileSet);
+    }
+    
+    public void addArchives(FileSet fileSet) {
+        this.archiveFileSets.add(fileSet);
+    }
+
+    public void execute() throws BuildException {
+
+        validateArgs();
+
+        try {
+            if (this.archiveFileSets.size() > 0) {
+                for (final Iterator fileSetItr = this.archiveFileSets.iterator(); fileSetItr.hasNext();) {
+                    final FileSet fileSet = (FileSet)fileSetItr.next();
+                    final DirectoryScanner directoryScanner = fileSet.getDirectoryScanner(this.getProject());
+
+                    final File basedir = directoryScanner.getBasedir();
+                    final String[] includedFiles = directoryScanner.getIncludedFiles();
+
+                    for (int index = 0; index < includedFiles.length; index++) {
+                        AssemblerConfig config = new AssemblerConfig();
+
+                        final File archiveSource = new File(basedir, includedFiles[index]);
+                        config.setSource(archiveSource);
+                        config.setDestination(getDestdir());
+
+                        this.log("Assembling '" + archiveSource + "' to '" + getDestdir() + "'");
+                        Assembler assembler = AssemblerFactory.getFactory().createAssembler(config);
+                        assembler.assemble(config);
+                    }
+                }
+            }
+            else {
+                AssemblerConfig config = new AssemblerConfig();
+
+                final File archiveSource = getArchive();
+                if (archiveSource != null) {
+                    config.setSource(archiveSource);
+                    config.setDestination(getDestdir());
+                    this.log("Assembling '" + archiveSource + "' to '" + getDestdir() + "'");
+                }
+                else {
+                    config.setPortletDescriptor(getPortletxml());
+                    config.setWebappDescriptor(getWebxml());
+                    config.setDestination(getDestfile());
+                    this.log("Assembling '" + getWebxml() + "' to '" + getDestfile() + "'");
+                }
+
+                Assembler assembler = AssemblerFactory.getFactory().createAssembler(config);
+                assembler.assemble(config);
+            }
+        }
+
+        catch(UtilityException ue) {
+            throw new BuildException(ue);
+        }
+    }
+
+    private void validateArgs() throws BuildException {
+        //Check if running with webapp arg
+        if(webapp != null) {
+            if(!webapp.exists()) {
+               throw new BuildException("webapp "+webapp.getAbsolutePath()+ " does not exist");
+            }
+
+            if (archive != null) {
+                throw new BuildException("archive (or war) should not be specified if webapp is specified");
+            }
+            if (this.archiveFileSets.size() > 0) {
+                throw new BuildException("archive (or wars) should not be specified if webapp is specified");
+            }
+            // TODO check this
+            if (destdir != null) {
+                throw new BuildException("destfile should not be specified if webapp is specified");
+            }
+
+            return;
+        }
+
+        //Check if running with war arg
+        if (archive != null) {
+            if(!archive.exists()) {
+                throw new BuildException("Archive file "+archive.getAbsolutePath()+ " does not exist");
+            }
+
+            if (this.archiveFileSets.size() > 0) {
+                throw new BuildException("archives (or wars) should not be specified if archive (or war) is specified");
+            }
+            if (webapp != null) {
+                throw new BuildException("webapp should not be specified if archive (or war) is specified");
+            }
+            if (destfile != null) {
+                throw new BuildException("destfile should not be specified if archive (or war) is specified");
+            }
+            if (portletxml != null) {
+                throw new BuildException("portletxml should not be specified if archive (or war) is specified");
+            }
+            if (webxml != null) {
+                throw new BuildException("webxml should not be specified if archive (or war) is specified");
+            }
+
+            return;
+        }
+
+        //Check if running with archives or wars arg
+        if (this.archiveFileSets.size() > 0) {
+            if (archive != null) {
+                throw new BuildException("archives (or wars) should not be specified if archive (or war) is specified");
+            }
+            if (webapp != null) {
+                throw new BuildException("webapp should not be specified if archives (or wars) is specified");
+            }
+            if (destfile != null) {
+                throw new BuildException("destfile should not be specified if archives (or wars) is specified");
+            }
+            if (portletxml != null) {
+                throw new BuildException("portletxml should not be specified if archive (or wars) is specified");
+            }
+            if (webxml != null) {
+                throw new BuildException("webxml should not be specified if archives (or wars) is specified");
+            }
+
+            return;
+        }
+
+        //Check if running with portletxml && webxml args
+        if(portletxml == null || !portletxml.exists()) {
+            throw new BuildException("portletxml "+portletxml+" does not exist");
+        }
+        if(webxml == null || !webxml.exists()) {
+            throw new BuildException("webxml "+webxml + " does not exist");
+        }
+        if (archive != null) {
+            throw new BuildException("archive (or war) should not be specified if portletxml and webxml are specified");
+        }
+        if (this.archiveFileSets.size() > 0) {
+            throw new BuildException("archives (or wars) should not be specified if portletxml and webxml are specified");
+        }
+        if (destdir != null) {
+            // TODO check this
+            throw new BuildException("destfile should not be specified if portletxml and webxml are aspecified");
+        }
+    }
+}

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/main/java/org/apache/pluto/ant/AssembleTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/src/main/java/org/apache/pluto/ant/ExamineArchiveTask.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-container/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: portals/pluto/branches/pluto-1.1.x/pluto-container/src/assemble/bin.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-container/src/assemble/bin.xml?rev=607448&r1=607447&r2=607448&view=diff
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-container/src/assemble/bin.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-container/src/assemble/bin.xml Sat Dec 29 09:20:23 2007
@@ -1,55 +1,55 @@
-<!--
+<!--
   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.
--->
-<assembly>
-  <id>bin</id>
-  <formats>
-    <format>tar.gz</format>
-    <format>tar.bz2</format>
-    <format>zip</format>
-  </formats>
-  <fileSets>
-    <fileSet>
-      <directory>../</directory>
-      <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>README*</include>
-		<include>LICENSE*</include>
-		<include>NOTICE*</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>target</directory>
-	  <outputDirectory>/</outputDirectory>
-      <includes>
-        <include>*.jar</include>
-      </includes>
-    </fileSet>
-    <fileSet>
-      <directory>target/site</directory>
-	  <outputDirectory>docs</outputDirectory>
-      <includes>
-        <include>**/*.*</include>
-      </includes>
-    </fileSet>
-  </fileSets>
-  <dependencySets>
-    <dependencySet>
-	  <outputDirectory>lib</outputDirectory>
-      <scope>runtime</scope>
-    </dependencySet>
-  </dependencySets>
-</assembly>
+  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.
+-->
+<assembly>
+  <id>bin</id>
+  <formats>
+    <format>tar.gz</format>
+    <format>tar.bz2</format>
+    <format>zip</format>
+  </formats>
+  <fileSets>
+    <fileSet>
+      <directory>../</directory>
+      <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>README*</include>
+		<include>LICENSE*</include>
+		<include>NOTICE*</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target</directory>
+	  <outputDirectory>/</outputDirectory>
+      <includes>
+        <include>*.jar</include>
+      </includes>
+    </fileSet>
+    <fileSet>
+      <directory>target/site</directory>
+	  <outputDirectory>docs</outputDirectory>
+      <includes>
+        <include>**/*.*</include>
+      </includes>
+    </fileSet>
+  </fileSets>
+  <dependencySets>
+    <dependencySet>
+	  <outputDirectory>lib</outputDirectory>
+      <scope>runtime</scope>
+    </dependencySet>
+  </dependencySets>
+</assembly>

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-container/src/assemble/bin.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message