portals-pluto-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From e..@apache.org
Subject svn commit: r523636 [1/2] - in /portals/pluto/branches/pluto-1.1.x: ./ assembly/ maven-pluto-plugin/ pluto-ant-tasks/ pluto-container/ pluto-descriptor-api/ pluto-descriptor-impl/ pluto-portal-driver-impl/ pluto-portal-driver/ pluto-portal/ pluto-resou...
Date Thu, 29 Mar 2007 09:07:49 GMT
Author: esm
Date: Thu Mar 29 02:07:46 2007
New Revision: 523636

URL: http://svn.apache.org/viewvc?view=rev&rev=523636
Log:
[PLUTO-349]: Copied the maven-remote-resources-plugin from https://svn.apache.org/repos/asf/maven/plugins/trunk/maven-remote-resources-plugin r523522.

Hacked the resource manifest model, allowing us to add missing POM information in the remote-resources.xml file.  In order to allow building from a clean local repository, and to prevent circular dependencies, the plugin configuration had to be added to each child.  

Keeping this plugin seperate from the maven-pluto-plugin will allow us to easily remove it in the future if need be.


Added:
    portals/pluto/branches/pluto-1.1.x/pluto-resources/
    portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/
    portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/pom.xml   (with props)
    portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/
    portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/
    portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/
    portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/
    portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/
    portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/
    portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/
    portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/resources/
    portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/resources/remote/
    portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/resources/remote/BundleRemoteResourcesMojo.java   (with props)
    portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/resources/remote/ProcessRemoteResourcesMojo.java   (with props)
    portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/resources/remote/RemoteResourcesClassLoader.java   (with props)
    portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/mdo/
    portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/mdo/remote-resources.mdo
    portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/resources/
    portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/resources/META-INF/
    portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/resources/META-INF/plexus/
    portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/resources/META-INF/plexus/components.xml   (with props)
    portals/pluto/branches/pluto-1.1.x/pluto-resources/pom.xml   (with props)
    portals/pluto/branches/pluto-1.1.x/pluto-resources/src/
    portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/
    portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/
    portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/
    portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/LICENSE
    portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/LICENSE.vm   (with props)
    portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/NOTICE
    portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/NOTICE.vm   (with props)
    portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/maven/
    portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/maven/remote-resources.xml   (with props)
Modified:
    portals/pluto/branches/pluto-1.1.x/assembly/pom.xml
    portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/pom.xml
    portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/pom.xml
    portals/pluto/branches/pluto-1.1.x/pluto-container/pom.xml
    portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/pom.xml
    portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/pom.xml
    portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/pom.xml
    portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/pom.xml
    portals/pluto/branches/pluto-1.1.x/pluto-portal/pom.xml
    portals/pluto/branches/pluto-1.1.x/pluto-site/pom.xml
    portals/pluto/branches/pluto-1.1.x/pluto-taglib/pom.xml
    portals/pluto/branches/pluto-1.1.x/pluto-testsuite/pom.xml
    portals/pluto/branches/pluto-1.1.x/pluto-util/pom.xml
    portals/pluto/branches/pluto-1.1.x/pom.xml

Modified: portals/pluto/branches/pluto-1.1.x/assembly/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/assembly/pom.xml?view=diff&rev=523636&r1=523635&r2=523636
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/assembly/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/assembly/pom.xml Thu Mar 29 02:07:46 2007
@@ -88,6 +88,22 @@
               <workDirectory>target/assembly/work</workDirectory>
             </configuration>
           </plugin>
+            <plugin>
+                <groupId>org.apache.pluto</groupId>
+                <artifactId>pluto-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.pluto:pluto-resources:${pom.parent.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
       </build>
     </profile>

Modified: portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/pom.xml?view=diff&rev=523636&r1=523635&r2=523636
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/maven-pluto-plugin/pom.xml Thu Mar 29 02:07:46 2007
@@ -80,6 +80,22 @@
           <goalPrefix>pluto</goalPrefix>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.pluto</groupId>
+        <artifactId>pluto-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <resourceBundles>
+                <resourceBundle>org.apache.pluto:pluto-resources:${pom.parent.version}</resourceBundle>
+              </resourceBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   

Modified: portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/pom.xml?view=diff&rev=523636&r1=523635&r2=523636
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-ant-tasks/pom.xml Thu Mar 29 02:07:46 2007
@@ -35,6 +35,22 @@
           <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.pluto</groupId>
+        <artifactId>pluto-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <resourceBundles>
+                <resourceBundle>org.apache.pluto:pluto-resources:${pom.parent.version}</resourceBundle>
+              </resourceBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   

Modified: portals/pluto/branches/pluto-1.1.x/pluto-container/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-container/pom.xml?view=diff&rev=523636&r1=523635&r2=523636
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-container/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-container/pom.xml Thu Mar 29 02:07:46 2007
@@ -117,6 +117,22 @@
           <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.pluto</groupId>
+        <artifactId>pluto-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <resourceBundles>
+                <resourceBundle>org.apache.pluto:pluto-resources:${pom.parent.version}</resourceBundle>
+              </resourceBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/pom.xml?view=diff&rev=523636&r1=523635&r2=523636
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-api/pom.xml Thu Mar 29 02:07:46 2007
@@ -28,6 +28,22 @@
           <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
         </configuration>
       </plugin>
+      <plugin>
+          <groupId>org.apache.pluto</groupId>
+          <artifactId>pluto-resources-plugin</artifactId>
+          <executions>
+              <execution>
+                  <goals>
+                      <goal>process</goal>
+                  </goals>
+                  <configuration>
+                      <resourceBundles>
+                          <resourceBundle>org.apache.pluto:pluto-resources:${pom.parent.version}</resourceBundle>
+                      </resourceBundles>
+                  </configuration>
+              </execution>
+          </executions>
+      </plugin>
     </plugins>
   </build>
 </project>

Modified: portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/pom.xml?view=diff&rev=523636&r1=523635&r2=523636
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-descriptor-impl/pom.xml Thu Mar 29 02:07:46 2007
@@ -19,6 +19,22 @@
           <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.pluto</groupId>
+        <artifactId>pluto-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <resourceBundles>
+                <resourceBundle>org.apache.pluto:pluto-resources:${pom.parent.version}</resourceBundle>
+              </resourceBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
   

Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/pom.xml?view=diff&rev=523636&r1=523635&r2=523636
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver-impl/pom.xml Thu Mar 29 02:07:46 2007
@@ -123,6 +123,22 @@
                     <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
                 </configuration>
             </plugin>
+            <plugin>
+                <groupId>org.apache.pluto</groupId>
+                <artifactId>pluto-resources-plugin</artifactId>
+                <executions>
+                    <execution>
+                        <goals>
+                            <goal>process</goal>
+                        </goals>
+                        <configuration>
+                            <resourceBundles>
+                                <resourceBundle>org.apache.pluto:pluto-resources:${pom.parent.version}</resourceBundle>
+                            </resourceBundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
         </plugins>
     </build>
 

Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/pom.xml?view=diff&rev=523636&r1=523635&r2=523636
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal-driver/pom.xml Thu Mar 29 02:07:46 2007
@@ -113,6 +113,22 @@
           <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
         </configuration>
       </plugin>
+      <plugin>
+        <groupId>org.apache.pluto</groupId>
+        <artifactId>pluto-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <resourceBundles>
+                <resourceBundle>org.apache.pluto:pluto-resources:${pom.parent.version}</resourceBundle>
+              </resourceBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
     </plugins>
   </build>
 

Modified: portals/pluto/branches/pluto-1.1.x/pluto-portal/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-portal/pom.xml?view=diff&rev=523636&r1=523635&r2=523636
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-portal/pom.xml (original)
+++ portals/pluto/branches/pluto-1.1.x/pluto-portal/pom.xml Thu Mar 29 02:07:46 2007
@@ -129,6 +129,24 @@
           <resourcesDirectory>${basedir}/../pluto-site/src/site/resources</resourcesDirectory>
         </configuration>
       </plugin>
+      
+      <plugin>
+        <groupId>org.apache.pluto</groupId>
+        <artifactId>pluto-resources-plugin</artifactId>
+        <executions>
+          <execution>
+            <goals>
+              <goal>process</goal>
+            </goals>
+            <configuration>
+              <resourceBundles>
+                <resourceBundle>org.apache.pluto:pluto-resources:${pom.parent.version}</resourceBundle>
+              </resourceBundles>
+            </configuration>
+          </execution>
+        </executions>
+      </plugin>
+      
     </plugins>
 
   </build>

Added: portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/pom.xml?view=auto&rev=523636
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/pom.xml (added)
+++ portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/pom.xml Thu Mar 29 02:07:46 2007
@@ -0,0 +1,120 @@
+<?xml version="1.0"?>
+<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">
+
+  <parent>
+    <groupId>org.apache.pluto</groupId>
+    <artifactId>pluto</artifactId>
+    <version>1.1.3-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.pluto</groupId>
+  <artifactId>pluto-resources-plugin</artifactId>
+  <name>Pluto Remote Resources Maven Plugin</name>
+  <packaging>maven-plugin</packaging>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-project</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-core</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven</groupId>
+      <artifactId>maven-plugin-api</artifactId>
+      <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-downloader</artifactId>
+      <version>1.1</version>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.maven</groupId>
+        <artifactId>maven-model</artifactId>
+        <version>2.0</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-utils</artifactId>
+      <version>1.2</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-archiver</artifactId>
+      <version>1.0-alpha-7</version>
+    </dependency>
+    <dependency>
+      <groupId>org.codehaus.plexus</groupId>
+      <artifactId>plexus-velocity</artifactId>
+      <version>1.1.3</version>
+    </dependency>
+    
+    <!-- 
+        Dependency needs to be here so
+        that build from a clean local repo works
+     -->
+    <dependency>
+      <groupId>org.apache.pluto</groupId>
+      <artifactId>pluto-resources</artifactId>
+      <version>${pom.parent.version}</version>
+      <scope>provided</scope>
+    </dependency>
+    
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>3.8.1</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.maven.shared</groupId>
+      <artifactId>maven-plugin-testing-harness</artifactId>
+      <version>1.0-beta-1</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+
+  <build>
+    <plugins>
+      <plugin>
+          <artifactId>maven-plugin-plugin</artifactId>        
+          <configuration>
+              <goalPrefix>pluto</goalPrefix>
+          </configuration>
+      </plugin>
+      <plugin>
+        <groupId>org.codehaus.modello</groupId>
+        <artifactId>modello-maven-plugin</artifactId>
+        <version>1.0-alpha-7</version>
+        <executions>
+          <execution>
+            <id>site-docs</id>
+            <phase>pre-site</phase>
+            <goals>
+              <goal>xdoc</goal>
+              <goal>xsd</goal>
+            </goals>
+          </execution>
+          <execution>
+            <goals>
+              <goal>xpp3-writer</goal>
+              <goal>java</goal>
+              <goal>xpp3-reader</goal>
+            </goals>
+          </execution>
+        </executions>
+        <configuration>
+          <version>1.0.0</version>
+          <model>src/main/mdo/remote-resources.mdo</model>
+        </configuration>
+      </plugin>
+    </plugins>
+  </build>
+
+</project>

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

Added: portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/resources/remote/BundleRemoteResourcesMojo.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/resources/remote/BundleRemoteResourcesMojo.java?view=auto&rev=523636
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/resources/remote/BundleRemoteResourcesMojo.java (added)
+++ portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/resources/remote/BundleRemoteResourcesMojo.java Thu Mar 29 02:07:46 2007
@@ -0,0 +1,147 @@
+package org.apache.pluto.maven.resources.remote;
+
+/*
+ * 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.
+ */
+
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.pluto.maven.resources.remote.io.xpp3.RemoteResourcesBundleXpp3Writer;
+import org.codehaus.plexus.util.DirectoryScanner;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.StringUtils;
+
+import java.util.Arrays;
+import java.util.List;
+import java.util.Iterator;
+import java.io.File;
+import java.io.IOException;
+import java.io.Writer;
+import java.io.FileWriter;
+
+/**
+ * Bundle up the resources that should be considered as a remote-resource
+ *
+ * @goal bundle
+ * @phase generate-resources
+ */
+public class BundleRemoteResourcesMojo
+    extends AbstractMojo
+{
+    public static final String RESOURCES_MANIFEST = "META-INF/maven/remote-resources.xml";
+    
+    private static String[] DEFAULT_INCLUDES = new String [] {
+                                                              "**/*.txt",
+                                                              "**/*.vm",
+                                                   };
+
+
+    /**
+     * The directory which contains the resources you want packaged up in this resource bundle.
+     *
+     * @parameter expression="${basedir}/src/main/resources"
+     */
+    private File resourcesDirectory;
+
+    /**
+     * The directory where you want the resource bundle manifest written to.
+     * 
+     * @parameter expression="${project.build.outputDirectory}"
+     */
+    private File outputDirectory;
+    
+    
+    /**
+     * A list of files to include. Can contain ant-style wildcards and double wildcards.
+     * The default includes are
+     * <code>**&#47;*.txt   **&#47;*.vm</code>
+     * 
+     * @parameter
+     * @since 1.0-alpha-5
+     */
+    private String[] includes;
+
+    /**
+     * A list of files to exclude. Can contain ant-style wildcards and double wildcards.  
+     *
+     * @parameter
+     * @since 1.0-alpha-5
+     */
+    private String[] excludes;
+    
+    public void execute()
+        throws MojoExecutionException
+    {
+        if ( !resourcesDirectory.exists() )
+        {
+            return;
+        }        
+        
+        // Look at the content of ${basedir}/src/main/resources and create a manifest of the files
+        // so that velocity can easily process any resources inside the JAR that need to be processed.
+
+        RemoteResourcesBundle remoteResourcesBundle = new RemoteResourcesBundle();
+
+        DirectoryScanner scanner = new DirectoryScanner();
+
+        scanner.setBasedir( resourcesDirectory );
+        if ( includes != null && includes.length != 0 )
+        {
+            scanner.setIncludes( includes );
+        }
+        else
+        {
+            scanner.setIncludes( DEFAULT_INCLUDES );
+        }
+
+        if ( excludes != null && excludes.length != 0 )
+        {
+            scanner.setExcludes( excludes );
+        }
+
+        scanner.addDefaultExcludes();
+        scanner.scan();
+
+        List includedFiles = Arrays.asList( scanner.getIncludedFiles() );
+
+        for ( Iterator i = includedFiles.iterator(); i.hasNext(); )
+        {
+            String resource = (String) i.next();
+
+            remoteResourcesBundle.addRemoteResource( StringUtils.replace( resource, '\\', '/' ) );
+        }
+
+        
+        RemoteResourcesBundleXpp3Writer w = new RemoteResourcesBundleXpp3Writer();
+
+        try
+        {
+            File f = new File( outputDirectory, RESOURCES_MANIFEST );
+
+            FileUtils.mkdir( f.getParentFile().getAbsolutePath() );
+
+            Writer writer = new FileWriter( f );
+
+            w.write( writer, remoteResourcesBundle );
+        }
+        catch ( IOException e )
+        {
+            throw new MojoExecutionException( "Error creating remote resources manifest.", e );
+        }
+    }
+}

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

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/resources/remote/BundleRemoteResourcesMojo.java
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/resources/remote/ProcessRemoteResourcesMojo.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/resources/remote/ProcessRemoteResourcesMojo.java?view=auto&rev=523636
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/resources/remote/ProcessRemoteResourcesMojo.java (added)
+++ portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/resources/remote/ProcessRemoteResourcesMojo.java Thu Mar 29 02:07:46 2007
@@ -0,0 +1,635 @@
+/*
+ * 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.resources.remote;
+
+import java.io.BufferedReader;
+import java.io.File;
+import java.io.FileReader;
+import java.io.FileWriter;
+import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
+import java.io.StringReader;
+import java.net.MalformedURLException;
+import java.net.URL;
+import java.net.URLConnection;
+import java.text.SimpleDateFormat;
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.Enumeration;
+import java.util.HashMap;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Map;
+
+import org.apache.maven.artifact.Artifact;
+import org.apache.maven.artifact.InvalidRepositoryException;
+import org.apache.maven.artifact.factory.ArtifactFactory;
+import org.apache.maven.artifact.repository.ArtifactRepository;
+import org.apache.maven.artifact.repository.ArtifactRepositoryFactory;
+import org.apache.maven.artifact.versioning.VersionRange;
+import org.apache.maven.execution.MavenSession;
+import org.apache.maven.model.Model;
+import org.apache.maven.model.Resource;
+import org.apache.maven.model.io.xpp3.MavenXpp3Reader;
+import org.apache.maven.plugin.AbstractMojo;
+import org.apache.maven.plugin.MojoExecutionException;
+import org.apache.maven.project.MavenProject;
+import org.apache.maven.project.MavenProjectBuilder;
+import org.apache.maven.project.ProjectBuildingException;
+import org.apache.maven.project.ProjectUtils;
+import org.apache.maven.project.inheritance.ModelInheritanceAssembler;
+import org.apache.maven.shared.downloader.DownloadException;
+import org.apache.maven.shared.downloader.DownloadNotFoundException;
+import org.apache.maven.shared.downloader.Downloader;
+import org.apache.pluto.maven.resources.remote.io.xpp3.RemoteResourcesBundleXpp3Reader;
+import org.apache.velocity.VelocityContext;
+import org.codehaus.plexus.util.FileUtils;
+import org.codehaus.plexus.util.StringUtils;
+import org.codehaus.plexus.util.xml.pull.XmlPullParserException;
+import org.codehaus.plexus.velocity.VelocityComponent;
+
+/**
+ * Pull down resourceBundles containing remote resources and process the resources contained
+ * inside the artifact.
+ * <p/>
+ * Resources that end in ".vm" are treated as velocity templates.  For those, the ".vm" is 
+ * stripped off for the final artifact name and it's  fed through velocity to have properties
+ * expanded, conditions processed, etc...
+ * <p/>
+ * Resources that don't end in ".vm" are copied "as is". 
+ *
+ * @goal process
+ * @requiresDependencyResolution runtime
+ * @phase generate-resources
+ */
+public class ProcessRemoteResourcesMojo
+    extends AbstractMojo
+{
+    /**
+     * The local repository taken from Maven's runtime. Typically $HOME/.m2/repository.
+     *
+     * @parameter expression="${localRepository}"
+     */
+    private ArtifactRepository localRepository;
+
+    /**
+     * The remote repositories used as specified in your POM.
+     *
+     * @parameter expression="${project.repositories}"
+     */
+    private List remoteRepositories;
+
+    /**
+     * The current Maven project.
+     *
+     * @parameter expression="${project}"
+     */
+    private MavenProject project;
+
+    /**
+     * The directory where processed resources will be placed for packaging.
+     *
+     * @parameter expression="${project.build.directory}/maven-shared-archive-resources"
+     */
+    private File outputDirectory;
+    
+    /**
+     * The directory containing extra information appended to the generated resources.
+     *
+     * @parameter expression="${basedir}/src/main/appended-resources"
+     */
+    private File appendedResourcesDirectory;
+
+    /**
+     * The resource bundles that will be retrieved and processed.
+     *
+     * @parameter
+     * @required
+     */
+    private List resourceBundles;
+
+    
+    /**
+     * Skip remote-resource processing
+     * 
+     * @parameter expression="${remoteresources.skip}" default-value="false"
+     * @since 1.0-alpha-5
+     */
+    private boolean skip;
+
+    /**
+     * Additional properties to be passed to velocity.
+     * <p/>
+     * Several properties are automatically added:<br/>
+     *   project - the current MavenProject <br/>
+     *   projects - the list of dependency projects<br/>
+     *   projectTimespan - the timespan of the current project (requires inceptionYear in pom)<br/>
+     * <p/>
+     * See <a href="http://maven.apache.org/ref/current/maven-project/apidocs/org/apache/maven/project/MavenProject.html">
+     * the javadoc for MavenProject</a> for information about the properties on the MavenProject. 
+     *
+     * @parameter
+     */
+    private Map properties = new HashMap();
+    
+    /**
+     * The list of resources defined for the project.
+     *
+     * @parameter expression="${project.resources}"
+     * @required
+     */
+    private List resources;
+    
+    /**
+     * Supplemental project model, useful for defining POM metadata
+     * missing from dependant artifacts.
+     * 
+     * Key is generated by generateSupplementMapKey(String, String) 
+     * and the value is a Maven Model object.
+     */
+    private Map supplementModels = new HashMap();
+    
+    /**
+     * Merges supplemental project models with their existing POM.
+     * 
+     * @component
+     * @since 1.0-alpha-5
+     */
+    private ModelInheritanceAssembler inheritanceAssembler;
+    
+    /**
+     * Artifact downloader.
+     *
+     * @component
+     */
+    private Downloader downloader;
+
+    /**
+     * Velocity component.
+     *
+     * @component
+     */
+    private VelocityComponent velocity;
+
+    // These two things make this horrible. Maven artifact is way too complicated and the relationship between
+    // the model usage and maven-artifact needs to be reworked as well as all our tools that deal with it. The
+    // ProjectUtils should be a component so I don't have to expose the container and artifact factory here. Can't
+    // change it now because it's not released ...
+
+    /**
+     * Artifact repository factory component.
+     *
+     * @component
+     */
+    private ArtifactRepositoryFactory artifactRepositoryFactory;
+    
+    /**
+     * Artifact factory, needed to create artifacts.
+     *
+     * @component
+     */
+    private ArtifactFactory artifactFactory;
+    
+    /**
+     * The Maven session.
+     *
+     * @parameter expression="${session}"
+     */
+    private MavenSession mavenSession;
+    
+    
+   /**
+    * ProjectBuilder, needed to create projects from the artifacts.
+    *
+    * @component role="org.apache.maven.project.MavenProjectBuilder"
+    * @required
+    * @readonly
+    */
+   protected MavenProjectBuilder mavenProjectBuilder;
+
+
+    public void execute()
+        throws MojoExecutionException
+    {
+        if ( skip )
+        {
+            return;
+        }
+        
+        String inceptionYear = project.getInceptionYear();
+        String year = new SimpleDateFormat( "yyyy" ).format( new Date() );
+        
+        if ( StringUtils.isEmpty( inceptionYear ) )
+        {
+            getLog().info("inceptionYear not specified, defaulting to " + year);
+            inceptionYear = year;
+        }
+
+        RemoteResourcesClassLoader classLoader = new RemoteResourcesClassLoader();
+
+        int bundleCount = 1;
+
+        for ( Iterator i = resourceBundles.iterator(); i.hasNext(); )
+        {
+            String artifactDescriptor = (String) i.next();
+
+            // groupId:artifactId:version
+            String[] s = StringUtils.split( artifactDescriptor, ":" );
+
+            if ( s.length != 3 )
+            {
+                String position;
+
+                if ( bundleCount == 1 )
+                {
+                    position = "1st";
+                }
+                else if ( bundleCount == 2 )
+                {
+                    position = "2nd";
+                }
+                else if ( bundleCount == 3 )
+                {
+                    position = "3rd";
+                }
+                else
+                {
+                    position = bundleCount + "th";
+                }
+
+                throw new MojoExecutionException( "The " + position
+                    + " resource bundle configured must specify a groupId, artifactId, and" 
+                    + " version for a remote resource bundle. " 
+                    + "Must be of the form <resourceBundle>groupId:artifactId:version</resourceBundle>" );
+            }
+
+            try
+            {
+                File artifact = downloader.download( s[0], s[1], s[2], localRepository,
+                                                     ProjectUtils.buildArtifactRepositories( remoteRepositories,
+                                                         artifactRepositoryFactory,
+                                                         mavenSession.getContainer() ) );
+
+                classLoader.addURL( artifact.toURI().toURL() );
+            }
+            catch ( DownloadException e )
+            {
+                throw new MojoExecutionException( "Error downloading resources JAR.", e );
+            }
+            catch ( DownloadNotFoundException e )
+            {
+                throw new MojoExecutionException( "Resources JAR cannot be found.", e );
+            }
+            catch ( InvalidRepositoryException e )
+            {
+                throw new MojoExecutionException( "Resources JAR cannot be found.", e );
+            }
+            catch ( MalformedURLException e )
+            {
+                // Won't happen.
+            }
+
+            bundleCount++;
+        }
+
+        ClassLoader old = Thread.currentThread().getContextClassLoader();
+
+        Thread.currentThread().setContextClassLoader( classLoader );
+        
+        List bundles = readBundles( classLoader );
+        
+        // this initializes the supplementModels map; the map needs
+        // to be initialized prior to getProjects() being called.
+        loadSupplements(bundles);
+
+        VelocityContext context = new VelocityContext( properties );                
+
+        context.put( "project", project );
+        context.put( "projects", getProjects() );
+        
+        context.put( "presentYear", year );
+
+        if ( project.getInceptionYear().equals( year ) )
+        {
+            context.put( "projectTimespan", year );
+        }
+        else
+        {
+            context.put( "projectTimespan", project.getInceptionYear() + "-" + year );
+        }
+
+        try
+        {
+            
+            for ( Iterator bundleIter = bundles.iterator(); bundleIter.hasNext(); )
+            {
+
+                RemoteResourcesBundle bundle = (RemoteResourcesBundle)bundleIter.next();
+                
+                for ( Iterator i = bundle.getRemoteResources().iterator(); i.hasNext(); )
+                {
+                    String bundleResource = (String) i.next();
+
+                    String projectResource = bundleResource;
+
+                    boolean doVelocity = false;
+                    if ( projectResource.endsWith( ".vm" ) )
+                    {
+                        projectResource = projectResource.substring( 0, projectResource.length() - 3 );
+                        doVelocity = true;
+                    }
+
+                    // Don't overwrite resource that are already being provided.
+
+                    File f = new File( outputDirectory, projectResource );
+
+                    FileUtils.mkdir( f.getParentFile().getAbsolutePath() );
+
+                    if ( !copyResourceIfExists( f, projectResource ) )
+                    {
+                        if ( doVelocity) 
+                        {
+                            PrintWriter writer = new PrintWriter( new FileWriter( f ) );
+                            try 
+                            {
+                                velocity.getEngine().mergeTemplate( bundleResource, context, writer );
+    
+                                File appendedResourceFile = new File( appendedResourcesDirectory, projectResource );
+                                if ( appendedResourceFile.exists() ) 
+                                {
+                                    FileReader freader = new FileReader( appendedResourceFile );
+                                    BufferedReader breader = new BufferedReader( freader );
+                                    
+                                    String line = breader.readLine();
+                           
+                                    while ( line != null )
+                                    {
+                                        writer.println( line );
+                                        line = breader.readLine();
+                                    }
+                                }
+                            }
+                            finally
+                            {
+                                writer.close();
+                            }
+                        }
+                        else
+                        {
+                            URL resUrl = classLoader.getResource( bundleResource );
+                            if ( resUrl != null )
+                            {
+                                FileUtils.copyURLToFile( resUrl, f );
+                            }
+                        }
+                    }
+                }
+            }
+        }
+        catch ( IOException e )
+        {
+            throw new MojoExecutionException( "Error finding remote resources manifests", e );
+        }
+        catch ( XmlPullParserException e )
+        {
+            throw new MojoExecutionException( "Error parsing remote resource bundle descriptor.", e );
+        }
+        catch ( Exception e )
+        {
+            throw new MojoExecutionException( "Error rendering velocity resource.", e );
+        }
+
+        Thread.currentThread().setContextClassLoader( old );
+
+        // ----------------------------------------------------------------------------
+        // Push our newly generated resources directory into the MavenProject so that
+        // these resources can be picked up by the process-resources phase.
+        // ----------------------------------------------------------------------------
+
+        Resource resource = new Resource();
+
+        resource.setDirectory( outputDirectory.getAbsolutePath() );
+
+        project.getResources().add( resource );
+        project.getTestResources().add( resource );
+
+        // ----------------------------------------------------------------------------
+        // Write out archiver dot file
+        // ----------------------------------------------------------------------------
+
+        try
+        {
+            if ( outputDirectory.exists() )
+            {
+                File dotFile = new File( project.getBuild().getDirectory(), ".plxarc" );
+
+                FileUtils.mkdir( dotFile.getParentFile().getAbsolutePath() );
+                
+                FileUtils.fileWrite( dotFile.getAbsolutePath(), outputDirectory.getName() );
+            }
+        }
+        catch ( IOException e )
+        {
+            throw new MojoExecutionException( "Error creating dot file for archiving instructions.", e );
+        }
+    }
+    
+    protected List getProjects()
+        throws MojoExecutionException
+    {
+        List projects = new ArrayList();
+        
+        for ( Iterator it = project.getArtifacts().iterator() ; it.hasNext() ; ) 
+        {
+            Artifact artifact = (Artifact) it.next();
+            try 
+            {
+                if ( artifact.isSnapshot() )
+                {
+                    VersionRange rng = VersionRange.createFromVersion(artifact.getBaseVersion());
+                    artifact = artifactFactory.createDependencyArtifact( artifact.getGroupId(),
+                                                                         artifact.getArtifactId(),
+                                                                         rng,
+                                                                         artifact.getType(),
+                                                                         artifact.getClassifier(),
+                                                                         artifact.getScope(),
+                                                                         null,
+                                                                         artifact.isOptional() );
+                }
+                getLog().debug("Building project for " + artifact);
+                MavenProject p = mavenProjectBuilder.buildFromRepository( artifact,
+                                                        remoteRepositories,
+                                                        localRepository,
+                                                        true );
+                
+
+                String supplementKey = generateSupplementMapKey( p.getModel().getGroupId(), 
+                                                                 p.getModel().getArtifactId() );
+                
+                if ( supplementModels.containsKey( supplementKey ) )
+                {
+                    Model mergedModel = mergeModels( p.getModel(), 
+                                                     (Model) supplementModels.get( supplementKey ) );
+                    MavenProject mergedProject = new MavenProject( mergedModel );
+                    projects.add( mergedProject );
+                    getLog().debug( "Adding project with groupId [" + mergedProject.getGroupId() + "] (supplemented)" );
+                }
+                else 
+                {
+                    projects.add( p );
+                    getLog().debug( "Adding project with groupId [" + p.getGroupId() + "]" );
+                }
+            }
+            catch ( ProjectBuildingException e )
+            {
+                // TODO Auto-generated catch block
+                e.printStackTrace();
+            }
+        }
+        return projects;
+    }
+    
+    protected Model getSupplement(String supplementModelXml)
+        throws MojoExecutionException
+    {
+        MavenXpp3Reader modelReader = new MavenXpp3Reader();
+        Model model = null;
+        
+        try
+        {
+            model = modelReader.read( new StringReader( supplementModelXml ) );
+            String groupId = model.getGroupId();
+            String artifactId = model.getArtifactId();
+
+            if ( groupId == null || 
+                    groupId.trim().equals("") )
+            {
+                throw new MojoExecutionException( "Supplemental project XML requires that a <groupId> element be present." );
+            }
+            
+            if ( artifactId == null ||
+                    artifactId.trim().equals("") )
+            {
+                throw new MojoExecutionException( "Supplemental project XML requires that a <artifactId> element be present." );
+            }              
+        } 
+        catch ( IOException e )
+        {
+            getLog().warn( "Unable to read supplemental XML: " + e.getMessage(), e );
+        } 
+        catch ( XmlPullParserException e )
+        {
+            getLog().warn( "Unable to parse supplemental XML: " + e.getMessage(), e );
+        }
+        
+        return model;
+    }
+    
+    protected Model mergeModels(Model parent, Model child)
+    {
+        String pUrl = parent.getUrl();
+        String cUrl = child.getUrl();
+        inheritanceAssembler.assembleModelInheritance(child, parent);
+        String mergedUrl = child.getUrl();        
+        return child;
+    }
+    
+    private static String generateSupplementMapKey( String groupId, String artifactId )
+    {
+        return groupId.trim() + ":" + artifactId.trim();
+    }
+    
+    protected boolean copyResourceIfExists( File file, String relFileName )
+        throws IOException 
+    {
+        for ( Iterator i = resources.iterator(); i.hasNext(); )
+        {
+            Resource resource = (Resource) i.next();
+            File resourceDirectory = new File( resource.getDirectory() );
+
+            if ( !resourceDirectory.exists() )
+            {
+                continue;
+            }
+            //TODO - really should use the resource includes/excludes and name mapping
+            File source = new File( resourceDirectory, relFileName );
+            
+            if ( source.exists() 
+                && !source.equals( file ) )
+            {
+                //TODO - should use filters here
+                FileUtils.copyFile( source, file );
+                
+                //exclude the original (so eclipse doesn't complain about duplicate resources)
+                resource.addExclude( relFileName );
+                
+                return true;
+            }
+            
+        }
+        return false;
+    }
+    
+    private List readBundles( ClassLoader cl ) throws MojoExecutionException
+    {
+        InputStreamReader reader = null;
+        List bundles = new ArrayList();
+        
+        try 
+        {
+            for ( Enumeration e = cl.getResources( BundleRemoteResourcesMojo.RESOURCES_MANIFEST ); 
+                  e.hasMoreElements(); )
+            {
+                URL url = (URL) e.nextElement();
+                URLConnection conn = url.openConnection();
+                conn.connect();
+                reader = new InputStreamReader( conn.getInputStream() );                
+                RemoteResourcesBundleXpp3Reader bundleReader = new RemoteResourcesBundleXpp3Reader();
+                RemoteResourcesBundle bundle = bundleReader.read( reader );
+                bundles.add( bundle );
+            }
+        }
+        catch (IOException e)
+        {
+            throw new MojoExecutionException( "Unable to read resource manifest: " + e.getMessage(), e );
+        }
+        catch (XmlPullParserException e)
+        {
+            throw new MojoExecutionException( "Unable to parse resource manifest: " + e.getMessage(), e );
+        }
+        
+        return bundles;
+    }
+    
+    private void loadSupplements( List resourceBundles ) throws MojoExecutionException
+    {
+          getLog().debug("Loading supplemental models ...");
+          for ( Iterator bundles = resourceBundles.iterator(); bundles.hasNext(); )
+          {
+              RemoteResourcesBundle bundle = (RemoteResourcesBundle)bundles.next();
+              for ( Iterator i = bundle.getResourceSupplements().iterator(); i.hasNext(); )
+              {
+                  Model m = getSupplement( (String)i.next() );
+                  supplementModels.put( generateSupplementMapKey( m.getGroupId(), m.getArtifactId()), m );
+              }
+          }
+          getLog().debug("Supplements complete.");
+    }
+}

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

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/resources/remote/ProcessRemoteResourcesMojo.java
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/resources/remote/RemoteResourcesClassLoader.java
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/resources/remote/RemoteResourcesClassLoader.java?view=auto&rev=523636
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/resources/remote/RemoteResourcesClassLoader.java (added)
+++ portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/resources/remote/RemoteResourcesClassLoader.java Thu Mar 29 02:07:46 2007
@@ -0,0 +1,40 @@
+package org.apache.pluto.maven.resources.remote;
+
+/*
+ * 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.
+ */
+
+import java.net.URLClassLoader;
+import java.net.URL;
+
+/**
+ * @author Jason van Zyl
+ */
+public class RemoteResourcesClassLoader
+    extends URLClassLoader
+{
+    public RemoteResourcesClassLoader()
+    {
+        super( new URL[]{} );
+    }
+
+    public void addURL( URL url )
+    {
+        super.addURL( url );
+    }
+}

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

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/java/org/apache/pluto/maven/resources/remote/RemoteResourcesClassLoader.java
------------------------------------------------------------------------------
    svn:keywords = Id

Added: portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/mdo/remote-resources.mdo
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/mdo/remote-resources.mdo?view=auto&rev=523636
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/mdo/remote-resources.mdo (added)
+++ portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/mdo/remote-resources.mdo Thu Mar 29 02:07:46 2007
@@ -0,0 +1,88 @@
+<!--
+    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.
+-->
+<model>
+    <id>remoteResourcesBundle</id>
+    <name>RemoteResourcesBundle</name>
+    <description><![CDATA[
+    Project-local overrides to the build process based on detected or user-provided environmental parameters.
+    This is the model specification for ${basedir}/profiles.xml.
+  ]]></description>
+    <defaults>
+        <default>
+            <key>package</key>
+            <value>org.apache.pluto.maven.resources.remote</value>
+        </default>
+    </defaults>
+    <classes>
+        <class rootElement="true" xml.tagName="remoteResourcesBundle">
+            <name>RemoteResourcesBundle</name>
+            <version>1.0.0</version>
+            <description>Root element of the remote-resources.xml file.</description>
+            <fields>
+                <field>
+                    <name>remoteResources</name>
+                    <version>1.0.0</version>
+                    <description>
+                        <![CDATA[
+                            Remote resources that are contained 
+                            in a remote resources bundle.
+                        ]]>
+                    </description>
+                    <association>
+                        <type>String</type>
+                        <multiplicity>*</multiplicity>
+                    </association>
+                </field>
+                <field>
+                    <name>resourceSupplements</name>
+                    <version>1.0.0</version>
+                    <description>
+                        <![CDATA[
+                            Supplemental Maven Models.
+                        ]]>
+                    </description>
+                    <association>
+                        <type>String</type>
+                        <multiplicity>*</multiplicity>
+                    </association>
+                </field>
+            </fields>
+        </class>
+        <!--class xml.tagName="resourceBundleSupplement">
+            <name>ResourcesBundleSupplement</name>
+            <version>1.0.0</version>
+            <description>Root element of the remote-resources-supplement.xml file.</description>
+            <fields>
+                <field>
+                    <name>resourceSupplements</name>
+                    <version>1.0.0</version>
+                    <description>
+                        <![CDATA[
+                            Supplemental Maven Models.
+                        ]]>
+                    </description>
+                    <association>
+                        <type>String</type>
+                        <multiplicity>*</multiplicity>
+                    </association>
+                </field>
+            </fields>
+        </class-->
+    </classes>
+</model>

Added: portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/resources/META-INF/plexus/components.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/resources/META-INF/plexus/components.xml?view=auto&rev=523636
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/resources/META-INF/plexus/components.xml (added)
+++ portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/resources/META-INF/plexus/components.xml Thu Mar 29 02:07:46 2007
@@ -0,0 +1,47 @@
+<!--
+    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.
+-->
+
+<component-set>
+    <components>
+        <component>
+            <role>org.codehaus.plexus.velocity.VelocityComponent</role>
+            <implementation>org.codehaus.plexus.velocity.DefaultVelocityComponent</implementation>
+            <configuration>
+                <properties>
+                    <property>                                                                                                                   
+                        <name>resource.loader</name>
+                        <value>classpath</value>
+                    </property>
+                    <property>
+                        <name>classpath.resource.loader.class</name>
+                        <value>org.codehaus.plexus.velocity.ContextClassLoaderResourceLoader</value>
+                    </property>
+                    <property>
+                        <name>velocimacro.messages.on</name>
+                        <value>false</value>
+                    </property>
+                    <property>
+                        <name>resource.manager.logwhenfound</name>
+                        <value>false</value>
+                    </property>
+                </properties>
+            </configuration>
+        </component>
+    </components>
+</component-set>
\ No newline at end of file

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-resources-plugin/src/main/resources/META-INF/plexus/components.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/pluto/branches/pluto-1.1.x/pluto-resources/pom.xml
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-resources/pom.xml?view=auto&rev=523636
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-resources/pom.xml (added)
+++ portals/pluto/branches/pluto-1.1.x/pluto-resources/pom.xml Thu Mar 29 02:07:46 2007
@@ -0,0 +1,24 @@
+<?xml version="1.0"?>
+<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">
+  <parent>
+    <artifactId>pluto</artifactId>
+    <groupId>org.apache.pluto</groupId>
+    <version>1.1.3-SNAPSHOT</version>
+  </parent>
+
+  <modelVersion>4.0.0</modelVersion>
+  <groupId>org.apache.pluto</groupId>
+  <artifactId>pluto-resources</artifactId>
+  <name>Pluto Shared Resources</name>
+  <version>1.1.3-SNAPSHOT</version>
+  
+  <dependencies>
+    <dependency>
+      <groupId>junit</groupId>
+      <artifactId>junit</artifactId>
+      <version>${junit.version}</version>
+      <scope>test</scope>
+    </dependency>
+  </dependencies>
+  
+</project>

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

Added: portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/LICENSE?view=auto&rev=523636
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/LICENSE (added)
+++ portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/LICENSE Thu Mar 29 02:07:46 2007
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Added: portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/LICENSE.vm
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/LICENSE.vm?view=auto&rev=523636
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/LICENSE.vm (added)
+++ portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/LICENSE.vm Thu Mar 29 02:07:46 2007
@@ -0,0 +1,202 @@
+
+                                 Apache License
+                           Version 2.0, January 2004
+                        http://www.apache.org/licenses/
+
+   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+   1. Definitions.
+
+      "License" shall mean the terms and conditions for use, reproduction,
+      and distribution as defined by Sections 1 through 9 of this document.
+
+      "Licensor" shall mean the copyright owner or entity authorized by
+      the copyright owner that is granting the License.
+
+      "Legal Entity" shall mean the union of the acting entity and all
+      other entities that control, are controlled by, or are under common
+      control with that entity. For the purposes of this definition,
+      "control" means (i) the power, direct or indirect, to cause the
+      direction or management of such entity, whether by contract or
+      otherwise, or (ii) ownership of fifty percent (50%) or more of the
+      outstanding shares, or (iii) beneficial ownership of such entity.
+
+      "You" (or "Your") shall mean an individual or Legal Entity
+      exercising permissions granted by this License.
+
+      "Source" form shall mean the preferred form for making modifications,
+      including but not limited to software source code, documentation
+      source, and configuration files.
+
+      "Object" form shall mean any form resulting from mechanical
+      transformation or translation of a Source form, including but
+      not limited to compiled object code, generated documentation,
+      and conversions to other media types.
+
+      "Work" shall mean the work of authorship, whether in Source or
+      Object form, made available under the License, as indicated by a
+      copyright notice that is included in or attached to the work
+      (an example is provided in the Appendix below).
+
+      "Derivative Works" shall mean any work, whether in Source or Object
+      form, that is based on (or derived from) the Work and for which the
+      editorial revisions, annotations, elaborations, or other modifications
+      represent, as a whole, an original work of authorship. For the purposes
+      of this License, Derivative Works shall not include works that remain
+      separable from, or merely link (or bind by name) to the interfaces of,
+      the Work and Derivative Works thereof.
+
+      "Contribution" shall mean any work of authorship, including
+      the original version of the Work and any modifications or additions
+      to that Work or Derivative Works thereof, that is intentionally
+      submitted to Licensor for inclusion in the Work by the copyright owner
+      or by an individual or Legal Entity authorized to submit on behalf of
+      the copyright owner. For the purposes of this definition, "submitted"
+      means any form of electronic, verbal, or written communication sent
+      to the Licensor or its representatives, including but not limited to
+      communication on electronic mailing lists, source code control systems,
+      and issue tracking systems that are managed by, or on behalf of, the
+      Licensor for the purpose of discussing and improving the Work, but
+      excluding communication that is conspicuously marked or otherwise
+      designated in writing by the copyright owner as "Not a Contribution."
+
+      "Contributor" shall mean Licensor and any individual or Legal Entity
+      on behalf of whom a Contribution has been received by Licensor and
+      subsequently incorporated within the Work.
+
+   2. Grant of Copyright License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      copyright license to reproduce, prepare Derivative Works of,
+      publicly display, publicly perform, sublicense, and distribute the
+      Work and such Derivative Works in Source or Object form.
+
+   3. Grant of Patent License. Subject to the terms and conditions of
+      this License, each Contributor hereby grants to You a perpetual,
+      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+      (except as stated in this section) patent license to make, have made,
+      use, offer to sell, sell, import, and otherwise transfer the Work,
+      where such license applies only to those patent claims licensable
+      by such Contributor that are necessarily infringed by their
+      Contribution(s) alone or by combination of their Contribution(s)
+      with the Work to which such Contribution(s) was submitted. If You
+      institute patent litigation against any entity (including a
+      cross-claim or counterclaim in a lawsuit) alleging that the Work
+      or a Contribution incorporated within the Work constitutes direct
+      or contributory patent infringement, then any patent licenses
+      granted to You under this License for that Work shall terminate
+      as of the date such litigation is filed.
+
+   4. Redistribution. You may reproduce and distribute copies of the
+      Work or Derivative Works thereof in any medium, with or without
+      modifications, and in Source or Object form, provided that You
+      meet the following conditions:
+
+      (a) You must give any other recipients of the Work or
+          Derivative Works a copy of this License; and
+
+      (b) You must cause any modified files to carry prominent notices
+          stating that You changed the files; and
+
+      (c) You must retain, in the Source form of any Derivative Works
+          that You distribute, all copyright, patent, trademark, and
+          attribution notices from the Source form of the Work,
+          excluding those notices that do not pertain to any part of
+          the Derivative Works; and
+
+      (d) If the Work includes a "NOTICE" text file as part of its
+          distribution, then any Derivative Works that You distribute must
+          include a readable copy of the attribution notices contained
+          within such NOTICE file, excluding those notices that do not
+          pertain to any part of the Derivative Works, in at least one
+          of the following places: within a NOTICE text file distributed
+          as part of the Derivative Works; within the Source form or
+          documentation, if provided along with the Derivative Works; or,
+          within a display generated by the Derivative Works, if and
+          wherever such third-party notices normally appear. The contents
+          of the NOTICE file are for informational purposes only and
+          do not modify the License. You may add Your own attribution
+          notices within Derivative Works that You distribute, alongside
+          or as an addendum to the NOTICE text from the Work, provided
+          that such additional attribution notices cannot be construed
+          as modifying the License.
+
+      You may add Your own copyright statement to Your modifications and
+      may provide additional or different license terms and conditions
+      for use, reproduction, or distribution of Your modifications, or
+      for any such Derivative Works as a whole, provided Your use,
+      reproduction, and distribution of the Work otherwise complies with
+      the conditions stated in this License.
+
+   5. Submission of Contributions. Unless You explicitly state otherwise,
+      any Contribution intentionally submitted for inclusion in the Work
+      by You to the Licensor shall be under the terms and conditions of
+      this License, without any additional terms or conditions.
+      Notwithstanding the above, nothing herein shall supersede or modify
+      the terms of any separate license agreement you may have executed
+      with Licensor regarding such Contributions.
+
+   6. Trademarks. This License does not grant permission to use the trade
+      names, trademarks, service marks, or product names of the Licensor,
+      except as required for reasonable and customary use in describing the
+      origin of the Work and reproducing the content of the NOTICE file.
+
+   7. Disclaimer of Warranty. Unless required by applicable law or
+      agreed to in writing, Licensor provides the Work (and each
+      Contributor provides its Contributions) on an "AS IS" BASIS,
+      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+      implied, including, without limitation, any warranties or conditions
+      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+      PARTICULAR PURPOSE. You are solely responsible for determining the
+      appropriateness of using or redistributing the Work and assume any
+      risks associated with Your exercise of permissions under this License.
+
+   8. Limitation of Liability. In no event and under no legal theory,
+      whether in tort (including negligence), contract, or otherwise,
+      unless required by applicable law (such as deliberate and grossly
+      negligent acts) or agreed to in writing, shall any Contributor be
+      liable to You for damages, including any direct, indirect, special,
+      incidental, or consequential damages of any character arising as a
+      result of this License or out of the use or inability to use the
+      Work (including but not limited to damages for loss of goodwill,
+      work stoppage, computer failure or malfunction, or any and all
+      other commercial damages or losses), even if such Contributor
+      has been advised of the possibility of such damages.
+
+   9. Accepting Warranty or Additional Liability. While redistributing
+      the Work or Derivative Works thereof, You may choose to offer,
+      and charge a fee for, acceptance of support, warranty, indemnity,
+      or other liability obligations and/or rights consistent with this
+      License. However, in accepting such obligations, You may act only
+      on Your own behalf and on Your sole responsibility, not on behalf
+      of any other Contributor, and only if You agree to indemnify,
+      defend, and hold each Contributor harmless for any liability
+      incurred by, or claims asserted against, such Contributor by reason
+      of your accepting any such warranty or additional liability.
+
+   END OF TERMS AND CONDITIONS
+
+   APPENDIX: How to apply the Apache License to your work.
+
+      To apply the Apache License to your work, attach the following
+      boilerplate notice, with the fields enclosed by brackets "[]"
+      replaced with your own identifying information. (Don't include
+      the brackets!)  The text should be enclosed in the appropriate
+      comment syntax for the file format. We also recommend that a
+      file or class name and description of purpose be included on the
+      same "printed page" as the copyright notice for easier
+      identification within third-party archives.
+
+   Copyright [yyyy] [name of copyright owner]
+
+   Licensed under the Apache License, Version 2.0 (the "License");
+   you may not use this file except in compliance with the License.
+   You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+   Unless required by applicable law or agreed to in writing, software
+   distributed under the License is distributed on an "AS IS" BASIS,
+   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+   See the License for the specific language governing permissions and
+   limitations under the License.

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/LICENSE.vm
------------------------------------------------------------------------------
    svn:eol-style = native

Added: portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/NOTICE?view=auto&rev=523636
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/NOTICE (added)
+++ portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/NOTICE Thu Mar 29 02:07:46 2007
@@ -0,0 +1,11 @@
+// ------------------------------------------------------------------
+// NOTICE file corresponding to the section 4d of The Apache License,                                                                                               
+// Version 2.0, in this case for Apache JAR Resource Bundle                                                                                  
+// ------------------------------------------------------------------
+
+Apache JAR Resource Bundle
+Copyright 2006-2007 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+

Added: portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/NOTICE.vm
URL: http://svn.apache.org/viewvc/portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/NOTICE.vm?view=auto&rev=523636
==============================================================================
--- portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/NOTICE.vm (added)
+++ portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/NOTICE.vm Thu Mar 29 02:07:46 2007
@@ -0,0 +1,39 @@
+// ------------------------------------------------------------------
+// NOTICE file corresponding to the section 4d of The Apache License,
+// Version 2.0, in this case for #if ($projectName)$projectName#else${project.name}#end
+
+// ------------------------------------------------------------------
+
+#if ($projectName)$projectName#else${project.name}#end
+
+Copyright ${projectTimespan}#if($project.organization.name) $project.organization.name#else The Apache Software Foundation#end
+
+
+This product includes software developed at
+#if($project.organization.name)$project.organization.name ($project.organization.url).#else
+The Apache Software Foundation (http://www.apache.org/).#end
+
+#if($preProjectText)
+$preProjectText
+#end
+
+#if(!$noProjects)
+#foreach ( $project in $projects )
+This product includes/uses software, $project.name#if($project.url) ($project.url)#end
+#if( $project.organization.name )
+,
+developed by $project.organization.name #if( $project.organization.url ) ($project.organization.url)#end
+#end
+#if ($addLicense)#foreach ( $license in $project.licenses)
+
+License: $license.name #if ($license.url) ($license.url)#end
+#end#end
+
+
+#end
+#end
+
+#if($postProjectText)
+$postProjectText
+#end
+

Propchange: portals/pluto/branches/pluto-1.1.x/pluto-resources/src/main/resources/META-INF/NOTICE.vm
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message