myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From lu4...@apache.org
Subject svn commit: r1299553 - in /myfaces/core/branches/2.0.x: api/pom.xml assembly/pom.xml bundle/pom.xml impl-api/ impl/pom.xml implee6/pom.xml integration-tests/pom.xml parent/ parent/pom.xml pom.xml shared-public/ shared-public/pom.xml shared/pom.xml
Date Mon, 12 Mar 2012 03:23:27 GMT
Author: lu4242
Date: Mon Mar 12 03:23:27 2012
New Revision: 1299553

URL: http://svn.apache.org/viewvc?rev=1299553&view=rev
Log:
create parent module and fix all other pom.xml files

Modified:
    myfaces/core/branches/2.0.x/api/pom.xml
    myfaces/core/branches/2.0.x/assembly/pom.xml
    myfaces/core/branches/2.0.x/bundle/pom.xml
    myfaces/core/branches/2.0.x/impl-api/   (props changed)
    myfaces/core/branches/2.0.x/impl/pom.xml
    myfaces/core/branches/2.0.x/implee6/pom.xml
    myfaces/core/branches/2.0.x/integration-tests/pom.xml
    myfaces/core/branches/2.0.x/parent/   (props changed)
    myfaces/core/branches/2.0.x/parent/pom.xml
    myfaces/core/branches/2.0.x/pom.xml
    myfaces/core/branches/2.0.x/shared-public/   (props changed)
    myfaces/core/branches/2.0.x/shared-public/pom.xml
    myfaces/core/branches/2.0.x/shared/pom.xml

Modified: myfaces/core/branches/2.0.x/api/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/api/pom.xml?rev=1299553&r1=1299552&r2=1299553&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/api/pom.xml (original)
+++ myfaces/core/branches/2.0.x/api/pom.xml Mon Mar 12 03:23:27 2012
@@ -21,6 +21,7 @@
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-core-project</artifactId>
         <version>2.0.13-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Modified: myfaces/core/branches/2.0.x/assembly/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/assembly/pom.xml?rev=1299553&r1=1299552&r2=1299553&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/assembly/pom.xml (original)
+++ myfaces/core/branches/2.0.x/assembly/pom.xml Mon Mar 12 03:23:27 2012
@@ -28,6 +28,7 @@
     <groupId>org.apache.myfaces.core</groupId>
     <artifactId>myfaces-core-project</artifactId>
     <version>2.0.13-SNAPSHOT</version>
+    <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <scm>

Modified: myfaces/core/branches/2.0.x/bundle/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/bundle/pom.xml?rev=1299553&r1=1299552&r2=1299553&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/bundle/pom.xml (original)
+++ myfaces/core/branches/2.0.x/bundle/pom.xml Mon Mar 12 03:23:27 2012
@@ -21,6 +21,7 @@
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-core-project</artifactId>
         <version>2.0.13-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Propchange: myfaces/core/branches/2.0.x/impl-api/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 12 03:23:27 2012
@@ -0,0 +1,12 @@
+*.iml
+*.ipr
+*.iws
+*.jdbc
+.classpath
+.externalToolBuilders
+.project
+.settings
+derby.log
+maven-eclipse.xml
+myfacesOrchestraDB
+target

Modified: myfaces/core/branches/2.0.x/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/impl/pom.xml?rev=1299553&r1=1299552&r2=1299553&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/impl/pom.xml (original)
+++ myfaces/core/branches/2.0.x/impl/pom.xml Mon Mar 12 03:23:27 2012
@@ -21,6 +21,7 @@
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-core-project</artifactId>
         <version>2.0.13-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Modified: myfaces/core/branches/2.0.x/implee6/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/implee6/pom.xml?rev=1299553&r1=1299552&r2=1299553&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/implee6/pom.xml (original)
+++ myfaces/core/branches/2.0.x/implee6/pom.xml Mon Mar 12 03:23:27 2012
@@ -21,6 +21,7 @@
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-core-project</artifactId>
         <version>2.0.13-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Modified: myfaces/core/branches/2.0.x/integration-tests/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/integration-tests/pom.xml?rev=1299553&r1=1299552&r2=1299553&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/integration-tests/pom.xml (original)
+++ myfaces/core/branches/2.0.x/integration-tests/pom.xml Mon Mar 12 03:23:27 2012
@@ -21,6 +21,7 @@
         <groupId>org.apache.myfaces.core</groupId>
         <artifactId>myfaces-core-project</artifactId>
         <version>2.0.9-SNAPSHOT</version>
+        <relativePath>../parent/pom.xml</relativePath>
     </parent>
 
     <modelVersion>4.0.0</modelVersion>

Propchange: myfaces/core/branches/2.0.x/parent/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 12 03:23:27 2012
@@ -0,0 +1,12 @@
+*.iml
+*.ipr
+*.iws
+*.jdbc
+.classpath
+.externalToolBuilders
+.project
+.settings
+derby.log
+maven-eclipse.xml
+myfacesOrchestraDB
+target

Modified: myfaces/core/branches/2.0.x/parent/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/parent/pom.xml?rev=1299553&r1=1299552&r2=1299553&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/parent/pom.xml (original)
+++ myfaces/core/branches/2.0.x/parent/pom.xml Mon Mar 12 03:23:27 2012
@@ -42,19 +42,11 @@
     </issueManagement>
 
     <scm>
-        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x</connection>
-        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x</developerConnection>
-        <url>http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/parent</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/parent</developerConnection>
+        <url>http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/parent</url>
     </scm>
 
-    <modules>
-        <module>api</module>
-        <module>implee6</module>
-        <module>shared</module>
-        <module>impl</module>
-        <module>bundle</module>
-    </modules>
-
     <build>
     
         <!-- Since Maven 3.0, this is required to add scpexe as protocol for deploy. -->
@@ -198,9 +190,6 @@
                     <name>prepareRelease</name>
                 </property>
             </activation>
-            <modules>
-                <module>assembly</module>
-            </modules>
             <build>
                 <plugins>
                     <plugin>
@@ -220,9 +209,6 @@
                     <value>true</value>
                 </property>
             </activation>
-            <modules>
-                <module>assembly</module>
-            </modules>
             <build>
                 <plugins>
                     <plugin>
@@ -235,14 +221,6 @@
             </build>
         </profile>
 
-        <!-- run MyFaces core integration tests with mvn clean install -Pintegration-tests
-->
-        <profile>
-            <id>integration-tests</id>
-            <modules>
-                <module>integration-tests</module>
-            </modules>
-        </profile>
-
     </profiles>
 
 
@@ -286,7 +264,7 @@
                 <artifactId>myfaces-impl</artifactId>
                 <version>${project.version}</version>
             </dependency>
-            
+
             <dependency>
                 <groupId>org.apache.myfaces.core.internal</groupId>
                 <artifactId>myfaces-impl-shared</artifactId>

Modified: myfaces/core/branches/2.0.x/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/pom.xml?rev=1299553&r1=1299552&r2=1299553&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/pom.xml (original)
+++ myfaces/core/branches/2.0.x/pom.xml Mon Mar 12 03:23:27 2012
@@ -26,9 +26,9 @@
     <modelVersion>4.0.0</modelVersion>
 
     <groupId>org.apache.myfaces.core</groupId>
-    <artifactId>myfaces-core-project</artifactId>
+    <artifactId>myfaces-core-module</artifactId>
     <packaging>pom</packaging>
-    <name>Apache MyFaces JSF-2.0 Core Project</name>
+    <name>Apache MyFaces JSF-2.0 Core Module</name>
     <description>
         This project is the home of the MyFaces implementation of the JavaServer Faces 2.0
specification, and
         consists of an API module (javax.faces.* classes) and an implementation module (org.apache.myfaces.*
classes).
@@ -48,6 +48,7 @@
     </scm>
 
     <modules>
+        <module>parent</module>
         <module>api</module>
         <module>implee6</module>
         <module>shared</module>
@@ -66,123 +67,7 @@
           </extension>
         </extensions>
         
-        <plugins>
-
-            <!-- JDK 1.5 -->
-            <plugin>
-                <artifactId>maven-compiler-plugin</artifactId>
-                <version>2.0.2</version>
-                <configuration>
-                    <source>1.5</source>
-                    <target>1.5</target>
-                </configuration>
-            </plugin>
-
-            <!-- ceckstyle - TODO use myfaces wide checkstyle config from myfaces-parent?
-->
-            <plugin>
-                <!--
-                  - Make a checkstyle violation a compile error. Note that if a compile error
occurs,
-                  - further information can be found in target/site/checkstyle.html (present
even when
-                  - just the compile goal and not the site goal has been run). Note also
that child
-                  - projects may redeclare this plugin and provide different configuration
settings
-                  - to use different checks (more or less strict than the default).
-                  -->
-                <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-checkstyle-plugin</artifactId>
-                <version>2.6</version>
-                <executions>
-                    <execution>
-                        <id>verify-style</id>
-                        <phase>verify</phase>
-                        <goals><goal>check</goal></goals>
-                    </execution>
-                </executions>
-                <configuration>
-                    <configLocation>default/myfaces-checks-minimal.xml</configLocation>
-                    <headerLocation>default/myfaces-header.txt</headerLocation>
-                </configuration>
-            </plugin>
-
-            <!-- attach -sources.jar to all our modules -->
-            <plugin>
-                <artifactId>maven-source-plugin</artifactId>
-                <version>2.0.4</version>
-                <executions>
-                    <execution>
-                        <id>attach-source</id>
-                        <goals>
-                            <goal>jar</goal>
-                        </goals>
-                    </execution>
-                </executions>
-            </plugin>
-            
-        </plugins>
-
-        <pluginManagement>
-            <plugins>
-
-                <plugin>
-                    <groupId>org.apache.myfaces.buildtools</groupId>
-                    <artifactId>myfaces-faces-plugin</artifactId>
-                    <version>1.0.0</version>
-                </plugin>
-
-                <plugin>
-                    <groupId>org.apache.myfaces.buildtools</groupId>
-                    <artifactId>myfaces-builder-plugin</artifactId>
-                    <version>1.0.10</version>
-                </plugin>
-                
-                <plugin>
-                    <groupId>org.apache.maven.plugins</groupId>
-                    <artifactId>maven-idea-plugin</artifactId>
-                    <version>2.1</version>
-                    <configuration>
-                        <jdkName>1.5</jdkName>
-                        <linkModules>true</linkModules>
-                        <downloadSources>true</downloadSources>
-                        <jdkLevel>1.5</jdkLevel>
-                    </configuration>
-                </plugin>
-
-                <plugin>
-                    <artifactId>maven-surefire-plugin</artifactId>
-                    <version>2.9</version>
-                </plugin>
-                
-                <plugin>
-                    <artifactId>maven-surefire-report-plugin</artifactId>
-                    <version>2.9</version>
-                </plugin>
-                
-                <!-- SITE GENERATION -->
-                <plugin>
-                    <artifactId>maven-javadoc-plugin</artifactId>
-                    <version>2.8</version>
-                </plugin>
-                <plugin>
-                  <artifactId>maven-site-plugin</artifactId>
-                  <version>3.0</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-jxr-plugin</artifactId>
-                    <version>2.3</version>
-                </plugin>
-                <plugin>
-                    <groupId>org.codehaus.mojo</groupId>
-                    <artifactId>taglist-maven-plugin</artifactId>
-                    <version>2.4</version>
-                </plugin>
-                <plugin>
-                    <artifactId>maven-changelog-plugin</artifactId>
-                    <version>2.2</version>
-                </plugin>
-            </plugins>
-        </pluginManagement>
-
     </build>
-
     
     <profiles>
 
@@ -245,325 +130,6 @@
 
     </profiles>
 
-
-    <reporting>
-        <plugins>
-            <plugin>
-                <!-- disable the plugin for this site project -->
-                <artifactId>maven-pmd-plugin</artifactId>
-                <reportSets>
-                    <reportSet />
-                </reportSets>
-            </plugin>
-            <plugin>
-              <artifactId>maven-project-info-reports-plugin</artifactId>
-              <version>2.4</version>
-            </plugin>
-        </plugins>
-    </reporting>
-    
-
-    <dependencyManagement>
-
-        <!--
-            Defines all dependencies used in this project.
-            All other project-modules reference the dependencies from here only by groupId
and artifactId.
-        -->
-        <dependencies>
-
-            <!-- INTERNAL DEPENDENCIES -->
-
-            <!-- myfaces-api -->
-            <dependency>
-                <groupId>org.apache.myfaces.core</groupId>
-                <artifactId>myfaces-api</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <!-- myfaces-impl -->
-            <dependency>
-                <groupId>org.apache.myfaces.core</groupId>
-                <artifactId>myfaces-impl</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-            
-            <dependency>
-                <groupId>org.apache.myfaces.core.internal</groupId>
-                <artifactId>myfaces-impl-shared</artifactId>
-                <version>${project.version}</version>
-            </dependency>
-
-            <!-- myfaces-impl-ee6 (will be packed together with myfaces-impl by shade-plugin)
-->
-            <dependency>
-                <groupId>org.apache.myfaces.core.internal</groupId>
-                <artifactId>myfaces-impl-ee6</artifactId>
-                <version>${project.version}</version>
-                <scope>compile</scope>
-                <optional>true</optional>
-            </dependency>
-
-            
-            <!-- SPEC DEPENDENCIES -->
-
-            <!-- Servlet 2.5 -->
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-servlet_2.5_spec</artifactId>
-                <version>1.2</version>
-                <scope>provided</scope>
-            </dependency>
-
-            <!-- Servlet 3.0 (for myfaces-impl-ee6) -->
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-servlet_3.0_spec</artifactId>
-                <version>1.0</version>
-                <scope>provided</scope>
-            </dependency>
-
-            <!-- JSP 2.1 -->
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jsp_2.1_spec</artifactId>
-                <version>1.0.1</version>
-                <scope>provided</scope>
-                <exclusions>
-                    <!-- we want to use el 2.2 -->
-                    <exclusion>
-                          <groupId>org.apache.geronimo.specs</groupId>
-                          <artifactId>geronimo-el_1.0_spec</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-
-            <!-- JSTL 1.2 -->
-            <dependency>
-                <groupId>javax.servlet</groupId>
-                <artifactId>jstl</artifactId>
-                <version>1.2</version>
-                <scope>provided</scope>
-                <exclusions>
-                    <!-- we already have a jsp-api -->
-                    <exclusion>
-                          <groupId>javax.servlet</groupId>
-                          <artifactId>jsp-api</artifactId>
-                    </exclusion>
-                </exclusions>
-            </dependency>
-            
-            <!-- annotations 1.0 (javax.annotation.*) -->
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-annotation_1.0_spec</artifactId>
-                <version>1.1.1</version>
-                <scope>provided</scope>
-            </dependency>
-
-            <!-- el 2.2 (javax.el.*) -->
-            <!--
-              NOTE that we are also compatible with el 1.0, but we need to use el 2.2 as
-              compile-dependency, because our ValueExpression wrappers need to support getValueReference().
-            -->
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-el_2.2_spec</artifactId>
-                <version>1.0.1</version>
-                <scope>provided</scope>
-            </dependency>
-
-            <!-- el 1.0 (javax.el.*) -->
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-el_1.0_spec</artifactId>
-                <version>1.0.2</version>
-                <scope>provided</scope>
-            </dependency>
-
-            <!-- bean-validation 1.0 (javax.validation.*) -->
-            <!-- NOTE that this must be compile + optional -->
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-validation_1.0_spec</artifactId>
-                <version>1.1</version>
-                <scope>compile</scope>
-                <optional>true</optional>
-            </dependency>
-
-            <!-- jpa 3.0 - needed in AllAnnotationLifecycleProvider -->
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-jpa_3.0_spec</artifactId>
-                <version>1.1.1</version>
-                <scope>compile</scope>
-                <optional>true</optional>
-            </dependency>
-
-            <!-- ejb 3.0 - needed in AllAnnotationLifecycleProvider -->
-            <dependency>
-                <groupId>org.apache.geronimo.specs</groupId>
-                <artifactId>geronimo-ejb_3.0_spec</artifactId>
-                <version>1.0.1</version>
-                <scope>compile</scope>
-                <optional>true</optional>
-            </dependency>
-
-
-            <!-- UTILITY DEPENDENCIES -->
-
-            <!-- builder-annotations like @JSFWebConfigParam -->
-            <dependency>
-                <groupId>org.apache.myfaces.buildtools</groupId>
-                <artifactId>myfaces-builder-annotations</artifactId>
-                <version>1.0.9</version>
-                <scope>provided</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-collections</groupId>
-                <artifactId>commons-collections</artifactId>
-                <version>3.2</version>
-                <scope>compile</scope>
-            </dependency>
-              
-            <dependency>
-                <groupId>commons-codec</groupId>
-                <artifactId>commons-codec</artifactId>
-                <version>1.3</version>
-                <scope>compile</scope>
-            </dependency>
-            
-            <dependency>
-                <groupId>commons-beanutils</groupId>
-                <artifactId>commons-beanutils</artifactId>
-                <version>1.8.3</version>
-                <scope>compile</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>commons-digester</groupId>
-                <artifactId>commons-digester</artifactId>
-                <version>1.8</version>
-                <scope>compile</scope>
-            </dependency>
-
-
-            <!-- SPI DEPENDENCIES (compile + optional) -->
-
-            <!-- tomcat 6.0.x support (LifecycleProvider) -->
-            <dependency>
-                <groupId>org.apache.tomcat</groupId>
-                <artifactId>catalina</artifactId>
-                <version>6.0.29</version>
-                <scope>compile</scope>
-                <optional>true</optional>
-            </dependency>
-
-            <!-- tomcat 7 support (LifecycleProvider) -->
-            <dependency>
-                <groupId>org.apache.tomcat</groupId>
-                <artifactId>tomcat-catalina</artifactId>
-                <version>7.0.0</version>
-                <scope>compile</scope>
-                <optional>true</optional>
-            </dependency>
-
-            <!-- Google guice support (GuiceResolver) -->
-            <dependency>
-                <groupId>com.google.code.guice</groupId>
-                <artifactId>guice</artifactId>
-                <version>1.0</version>
-                <scope>compile</scope>
-                <optional>true</optional>
-            </dependency>
-
-
-            <!-- TEST DEPENDENCIES -->
-
-            <dependency>
-                <groupId>junit</groupId>
-                <artifactId>junit</artifactId>
-                <version>4.8.1</version>
-                <scope>test</scope>
-            </dependency>
-            
-            <dependency>
-                <groupId>org.testng</groupId>
-                <artifactId>testng</artifactId>
-                <classifier>jdk15</classifier>
-                <version>5.1</version>
-                <scope>test</scope>
-            </dependency>
-
-            <!-- test cases of myfaces-api -->
-            <dependency>
-                <groupId>org.apache.myfaces.core</groupId>
-                <artifactId>myfaces-api</artifactId>
-                <classifier>tests</classifier>
-                <version>${project.version}</version>
-                <scope>test</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>org.apache.myfaces.test</groupId>
-                <artifactId>myfaces-test20</artifactId>
-                <version>1.0.4</version>
-                <scope>test</scope>
-            </dependency>
-
-            <!-- easymock -->
-            <dependency>
-                <groupId>org.easymock</groupId>
-                <artifactId>easymock</artifactId>
-                <version>2.3</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.easymock</groupId>
-                <artifactId>easymockclassextension</artifactId>
-                <version>2.3</version>
-                <scope>test</scope>
-            </dependency>
-
-            <!-- jmock -->
-            <dependency>
-                  <groupId>jmock</groupId>
-                  <artifactId>jmock</artifactId>
-                  <version>1.2.0</version>
-                  <scope>test</scope>
-            </dependency>
-            <dependency>
-                  <groupId>jmock</groupId>
-                  <artifactId>jmock-cglib</artifactId>
-                  <version>1.2.0</version>
-                  <scope>test</scope>
-            </dependency>
-
-            <dependency>
-                <groupId>de.berlios.jsunit</groupId>
-                <artifactId>jsunit-maven2-plugin</artifactId>
-                <version>1.3</version>
-                <scope>test</scope>
-            </dependency>
-
-            <!-- We need a real EL implementation for test ui:param tag,
-            because myfaces-test MockExpressionFactory is not designed to
-            handle VariableMapper stuff (see IncludeParamTestCase) -->
-            <dependency>
-                <groupId>org.apache.tomcat</groupId>
-                <artifactId>el-api</artifactId>
-                <version>6.0.28</version>
-                <scope>test</scope>
-            </dependency>
-            <dependency>
-                <groupId>org.apache.tomcat</groupId>
-                <artifactId>jasper-el</artifactId>
-                <version>6.0.28</version>
-                <scope>test</scope>
-            </dependency>
-
-        </dependencies>
-    </dependencyManagement>
-
     <pluginRepositories>
         <pluginRepository>
             <id>apache.snapshots.plugin</id>
@@ -591,7 +157,7 @@
         <site>
             <id>apache.website</id>
             <name>Apache Website</name>
-            <url>scpexe://people.apache.org/www/myfaces.apache.org/core20/</url>
+            <url>scpexe://people.apache.org/www/myfaces.apache.org/core20/module</url>
         </site>
     </distributionManagement>
 

Propchange: myfaces/core/branches/2.0.x/shared-public/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Mon Mar 12 03:23:27 2012
@@ -0,0 +1,12 @@
+*.iml
+*.ipr
+*.iws
+*.jdbc
+.classpath
+.externalToolBuilders
+.project
+.settings
+derby.log
+maven-eclipse.xml
+myfacesOrchestraDB
+target

Modified: myfaces/core/branches/2.0.x/shared-public/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/shared-public/pom.xml?rev=1299553&r1=1299552&r2=1299553&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/shared-public/pom.xml (original)
+++ myfaces/core/branches/2.0.x/shared-public/pom.xml Mon Mar 12 03:23:27 2012
@@ -21,21 +21,22 @@
       <groupId>org.apache.myfaces.core</groupId>
       <artifactId>myfaces-core-project</artifactId>
       <version>2.0.13-SNAPSHOT</version>
+      <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>
   
   <groupId>org.apache.myfaces.core.internal</groupId>
-  <artifactId>myfaces-impl-shared</artifactId>
+  <artifactId>myfaces-impl-shared-public</artifactId>
   <packaging>jar</packaging>
-  <name>Apache MyFaces Shared For JSF 2.0 - Core</name>
+  <name>Apache MyFaces Shared Public API For JSF 2.0 - Core</name>
   <description>The MyFaces Shared Core Subproject build the sources artifact
     needed by the shared-* modules</description>
 
   <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/shared</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/shared</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/core/branches/2.0.x/shared</url>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/shared-public</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/core/branches/2.0.x/shared-public</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/core/branches/2.0.x/shared-public</url>
   </scm>
   
   <dependencies>
@@ -112,100 +113,6 @@
            </execution>
          </executions>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>build-helper-maven-plugin</artifactId>
-        <version>1.5</version>
-        <executions>
-          <execution>
-            <id>add-resource</id>
-            <phase>generate-resources</phase>
-            <goals>
-              <goal>add-resource</goal>
-            </goals>
-            <configuration>
-              <resources>
-                <resource>
-                  <directory>${project.build.directory}/generated-resources/myfaces-javascript-plugin/</directory>
-               </resource>
-              </resources>
-            </configuration>
-          </execution>
-        </executions>
-      </plugin>    
-      <plugin>
-          <artifactId>myfaces-javascript-plugin</artifactId>
-          <groupId>org.apache.myfaces.buildtools</groupId>
-          <version>1.0.1</version>
-          <extensions>true</extensions>
-          <executions>
-               <execution>
-                  <id>compile-myfacesscripts</id>
-                  <goals>
-                      <goal>compile</goal>
-                  </goals>
-                  <phase>generate-resources</phase>
-                  <configuration>
-                      <descriptor>${basedir}/src/assembler/myfacesscripts-compiler.xml</descriptor>
-                      <outputDirectory>${project.build.directory}/generated-resources/myfaces-javascript-plugin/META-INF/resources/org.apache.myfaces/</outputDirectory>
-                  </configuration>
-              </execution>
-              <execution>
-                  <id>compile-myfacesscripts-uncompressed</id>
-                  <goals>
-                      <goal>compile</goal>
-                  </goals>
-                  <phase>generate-resources</phase>
-                  <configuration>
-                      <descriptor>${basedir}/src/assembler/myfacesscripts-uncompressed-compiler.xml</descriptor>
-                      <outputDirectory>${project.build.directory}/generated-resources/myfaces-javascript-plugin/META-INF/internal-resources/org.apache.myfaces/</outputDirectory>
-                  </configuration>
-              </execution>
-              <execution>
-                  <id>compress-myfacesscripts</id>
-                  <goals>
-                      <goal>compress</goal>
-                  </goals>
-                  <phase>generate-resources</phase>
-                  <configuration>
-                      <scripts>target/generated-resources/myfaces-javascript-plugin/META-INF/resources/org.apache.myfaces/</scripts>
-                      <excludes>
-                          <exclude>oamSubmit-uncompressed.js</exclude>
-                      </excludes>
-                      <compressor>yahooUI</compressor>
-                  </configuration>
-              </execution>
-          </executions>
-          <configuration>
-              <optimizationLevel>0</optimizationLevel>
-              <sourceDirectory>src/main/javascript</sourceDirectory>
-              <webappDirectory>${basedir}</webappDirectory>
-              <outputDirectory>${project.build.directory}/generated-resources/myfaces-javascript-plugin/META-INF/resources/org.apache.myfaces/</outputDirectory>
-          </configuration>
-      </plugin>
-      
-      <!-- 
-      <plugin>
-        <artifactId>maven-surefire-plugin</artifactId>
-        <version>2.1.2</version>
-        <configuration>
-          <excludes>
-            <exclude>**/*StateUtilsAES_CBCTest*</exclude>
-          </excludes>
-        </configuration>
-      </plugin>
-       -->
-      <plugin>
-        <artifactId>maven-source-plugin</artifactId>
-        <executions>
-          <execution>
-            <id>attach-source</id>
-            <goals>
-              <goal>jar</goal>
-            </goals>
-          </execution>
-        </executions>
-      </plugin>
     </plugins>
   </build>
   <profiles>

Modified: myfaces/core/branches/2.0.x/shared/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/branches/2.0.x/shared/pom.xml?rev=1299553&r1=1299552&r2=1299553&view=diff
==============================================================================
--- myfaces/core/branches/2.0.x/shared/pom.xml (original)
+++ myfaces/core/branches/2.0.x/shared/pom.xml Mon Mar 12 03:23:27 2012
@@ -21,6 +21,7 @@
       <groupId>org.apache.myfaces.core</groupId>
       <artifactId>myfaces-core-project</artifactId>
       <version>2.0.13-SNAPSHOT</version>
+      <relativePath>../parent/pom.xml</relativePath>
   </parent>
 
   <modelVersion>4.0.0</modelVersion>



Mime
View raw message