You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by st...@apache.org on 2012/11/16 16:16:23 UTC
svn commit: r1410393 - in /myfaces/core/trunk: ./ impl/
impl/src/main/java/org/apache/myfaces/ee6/
implee6/src/main/java/org/apache/myfaces/ee6/
implee6/src/main/resources/META-INF/services/
Author: struberg
Date: Fri Nov 16 15:16:22 2012
New Revision: 1410393
URL: http://svn.apache.org/viewvc?rev=1410393&view=rev
Log:
MYFACES-3649 prepare removal of shaded-impl and implee6
this just changes the pom and moves over the ServletContainerInitializer for now.
Later on I'll delete the modules completely.
Added:
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/ee6/
myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java (props changed)
- copied unchanged from r1410263, myfaces/core/trunk/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java
Removed:
myfaces/core/trunk/implee6/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java
myfaces/core/trunk/implee6/src/main/resources/META-INF/services/javax.servlet.ServletContainerInitializer
Modified:
myfaces/core/trunk/impl/pom.xml
myfaces/core/trunk/pom.xml
Modified: myfaces/core/trunk/impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/impl/pom.xml?rev=1410393&r1=1410392&r2=1410393&view=diff
==============================================================================
--- myfaces/core/trunk/impl/pom.xml (original)
+++ myfaces/core/trunk/impl/pom.xml Fri Nov 16 15:16:22 2012
@@ -536,44 +536,6 @@
</executions>
</plugin>
- <!-- include implee6 via maven-shade-plugin -->
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-shade-plugin</artifactId>
- <executions>
- <execution>
- <phase>package</phase>
- <goals>
- <goal>shade</goal>
- </goals>
- </execution>
- </executions>
- <configuration>
- <createDependencyReducedPom>false</createDependencyReducedPom>
- <createSourcesJar>true</createSourcesJar>
- <artifactSet>
- <includes>
- <include>org.apache.myfaces.core.internal:myfaces-impl-ee6</include>
- <include>org.apache.myfaces.core.internal:myfaces-impl-shared</include>
- </includes>
- </artifactSet>
- <filters>
- <filter>
- <artifact>org.apache.myfaces.core.internal:myfaces-impl-ee6</artifact>
- <includes>
- <include>META-INF/services/**</include>
- <include>org/apache/myfaces/**</include>
- </includes>
- <excludes>
- <exclude>META-INF/LICENSE</exclude>
- <exclude>META-INF/NOTICE</exclude>
- <exclude>META-INF/DEPENDENCIES</exclude>
- <exclude>META-INF/MANIFEST.MF</exclude>
- </excludes>
- </filter>
- </filters>
- </configuration>
- </plugin>
<!-- create OSGI-ready manifest.mf -->
<plugin>
@@ -645,124 +607,6 @@
<profiles>
- <!--
- <profile>
- <id>add-shared-dependency</id>
- <activation>
- <property>
- <name>dev</name>
- <value>true</value>
- </property>
- </activation>
- <dependencies>
- <dependency>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-impl</artifactId>
- <scope>compile</scope>
- </dependency>
- </dependencies>
- </profile>
-
- <profile>
- <id>unpack-shared</id>
- <activation>
- <property>
- <name>!dev</name>
- </property>
- </activation>
- <build>
- <plugins>
- <plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-dependency-plugin</artifactId>
- <version>2.0</version>
- <executions>
-
- <execution>
- <id>unpack-shared-impl</id>
- <phase>process-classes</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-impl</artifactId>
- <version>${myfaces-shared.version}</version>
- <excludes>META-INF/DEPENDENCIES,META-INF/LICENSE,META-INF/NOTICE,META-INF/MANIFEST.MF</excludes>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- </configuration>
- </execution>
-
- <execution>
- <id>unpack-shared-impl-sources</id>
- <phase>process-sources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-impl</artifactId>
- <version>${myfaces-shared.version}</version>
- <classifier>sources</classifier>
- <excludes>META-INF/**</excludes>
- </artifactItem>
- </artifactItems>
- <outputDirectory>${project.build.directory}/shared_sources</outputDirectory>
- </configuration>
- </execution>
-
- <execution>
- <id>unpack-impl-ee6</id>
- <phase>process-resources</phase>
- <goals>
- <goal>unpack</goal>
- </goals>
- <configuration>
- <artifactItems>
- <artifactItem>
- <groupId>org.apache.myfaces.core.internal</groupId>
- <artifactId>myfaces-impl-ee6</artifactId>
- <version>${project.version}</version>
- </artifactItem>
- </artifactItems>
- <includes>org/**</includes>
- <outputDirectory>${project.build.directory}/classes</outputDirectory>
- </configuration>
- </execution>
-
- </executions>
- </plugin>
-
- <plugin>
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
- <version>1.0</version>
- <executions>
- <execution>
- <id>add-source-shared</id>
- <phase>process-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/shared_sources</source>
- </sources>
- </configuration>
- </execution>
- </executions>
- </plugin>
-
- </plugins>
- </build>
- </profile>
- -->
<!--
- Whenever the full website is generated, the command
@@ -1076,6 +920,38 @@
</pluginRepositories>
</profile>
+ <profile>
+ <id>ee5</id>
+ <dependencies>
+ <!-- disable Servlet 3.0 -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
+ <scope>test</scope> <!-- just to make it go away -->
+ </dependency>
+
+ <!-- and enable Servlet 2.5 -->
+ <dependency>
+ <groupId>org.apache.geronimo.specs</groupId>
+ <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-compiler-plugin</artifactId>
+ <configuration>
+ <excludes>
+ <exclude>src/main/java/org/apache/myfaces/ee6</exclude>
+ </excludes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
</profiles>
@@ -1111,17 +987,11 @@
<optional>true</optional>
</dependency>
- <!-- maven-shade-plugin will exclude this dependency automatically -->
- <dependency>
- <groupId>org.apache.myfaces.core.internal</groupId>
- <artifactId>myfaces-impl-ee6</artifactId>
- <optional>true</optional> <!-- optional does not completely work in dependencyManagement (MNG-1630) -->
- </dependency>
- <!-- Servlet 2.5 -->
+ <!-- Servlet 3.0 by default. Use the -Pee5 compile for servlet-2.5 -->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-servlet_2.5_spec</artifactId>
+ <artifactId>geronimo-servlet_3.0_spec</artifactId>
</dependency>
<!-- JSP 2.1 -->
Propchange: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Propchange: myfaces/core/trunk/impl/src/main/java/org/apache/myfaces/ee6/MyFacesContainerInitializer.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: myfaces/core/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/core/trunk/pom.xml?rev=1410393&r1=1410392&r2=1410393&view=diff
==============================================================================
--- myfaces/core/trunk/pom.xml (original)
+++ myfaces/core/trunk/pom.xml Fri Nov 16 15:16:22 2012
@@ -50,8 +50,10 @@
<modules>
<module>parent</module>
<module>api</module>
+<!-- TODO REMOVE!
<module>shaded-impl</module>
<module>implee6</module>
+-->
<module>shared-public</module>
<module>shared</module>
<module>impl</module>