Repository: deltaspike
Updated Branches:
  refs/heads/master 8006d52c6 -> 727f95365


DELTASPIKE-655 ee6 only version of the jsf module

 (intermediate workaround for supporting an own javadoc-jar)


Project: http://git-wip-us.apache.org/repos/asf/deltaspike/repo
Commit: http://git-wip-us.apache.org/repos/asf/deltaspike/commit/35f40cc5
Tree: http://git-wip-us.apache.org/repos/asf/deltaspike/tree/35f40cc5
Diff: http://git-wip-us.apache.org/repos/asf/deltaspike/diff/35f40cc5

Branch: refs/heads/master
Commit: 35f40cc51f026b47a4e642e9f167fded5aa144d2
Parents: 8006d52
Author: gpetracek <[email protected]>
Authored: Sat Jul 5 12:59:28 2014 +0200
Committer: gpetracek <[email protected]>
Committed: Sat Jul 5 12:59:37 2014 +0200

----------------------------------------------------------------------
 deltaspike/modules/jsf/impl-ee6/pom.xml | 117 ++++++++++++++++++++-------
 1 file changed, 89 insertions(+), 28 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/deltaspike/blob/35f40cc5/deltaspike/modules/jsf/impl-ee6/pom.xml
----------------------------------------------------------------------
diff --git a/deltaspike/modules/jsf/impl-ee6/pom.xml 
b/deltaspike/modules/jsf/impl-ee6/pom.xml
index eac032e..17c3a48 100644
--- a/deltaspike/modules/jsf/impl-ee6/pom.xml
+++ b/deltaspike/modules/jsf/impl-ee6/pom.xml
@@ -30,51 +30,112 @@
 
     <name>Apache DeltaSpike JSF-Module Impl (EE6 only)</name>
 
+    <!-- TODO remove workaround and refactor it back to the shade-plugin (+ 
javadoc) -->
     <build>
+        <sourceDirectory>../impl/src/main/java</sourceDirectory>
+        <resources>
+            <resource>
+                <directory>../impl/src/main/resources</directory>
+            </resource>
+        </resources>
         <plugins>
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
-                <artifactId>maven-shade-plugin</artifactId>
-                <version>1.3.3</version>
+                <artifactId>maven-jar-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        
<exclude>org/apache/deltaspike/jsf/impl/scope/window/ClientWindowAdapter.class</exclude>
+                        
<exclude>org/apache/deltaspike/jsf/impl/navigation/DeltaSpikeNavigationHandlerWrapper.class</exclude>
+                        
<exclude>org/apache/deltaspike/jsf/impl/listener/request/JsfClientWindowAwareLifecycleWrapper.class</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+
+            <plugin>
+                <groupId>org.apache.maven.plugins</groupId>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <phase>process-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <includeEmptyDirs>true</includeEmptyDirs>
+                            
<outputDirectory>${project.build.directory}/classes/META-INF/resources/deltaspike-uncompressed</outputDirectory>
+                            <resources>
+                                <resource>
+                                    
<directory>${project.build.directory}/classes/META-INF/resources/deltaspike</directory>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.primefaces.extensions</groupId>
+                <artifactId>resources-optimizer-maven-plugin</artifactId>
+                <version>1.0.0</version>
                 <executions>
                     <execution>
-                        <phase>package</phase>
-                        <goals><goal>shade</goal></goals>
+                        <phase>compile</phase>
+                        <goals>
+                            <goal>optimize</goal>
+                        </goals>
                     </execution>
                 </executions>
                 <configuration>
-                    <finalName>${artifactId}-${version}</finalName>
-                    
<createDependencyReducedPom>true</createDependencyReducedPom>
-                    <createSourcesJar>true</createSourcesJar>
-                    <artifactSet>
-                        <excludes>
-                            <exclude>org.apache.deltaspike.core:*</exclude>
-                            
<exclude>org.apache.deltaspike.modules:deltaspike-security-module-api</exclude>
-                            
<exclude>org.apache.deltaspike.modules:deltaspike-security-module-impl</exclude>
-                            
<exclude>org.apache.deltaspike.modules:deltaspike-jsf-module-api</exclude>
-                        </excludes>
-                    </artifactSet>
-                    <filters>
-                        <filter>
-                            
<artifact>org.apache.deltaspike.modules:*</artifact>
-                            <excludes>
-                                
<exclude>org/apache/deltaspike/jsf/impl/scope/window/ClientWindowAdapter.class</exclude>
-                                
<exclude>org/apache/deltaspike/jsf/impl/navigation/DeltaSpikeNavigationHandlerWrapper.class</exclude>
-                                
<exclude>org/apache/deltaspike/jsf/impl/listener/request/JsfClientWindowAwareLifecycleWrapper.class</exclude>
-                            </excludes>
-                        </filter>
-                    </filters>
+                    
<inputDir>${project.build.directory}/classes/META-INF/resources/deltaspike/</inputDir>
+                    <resourceSets>
+                        <resourcesSet>
+                            <includes>
+                                <include>**/*.js</include>
+                                <include>**/*.css</include>
+                            </includes>
+                        </resourcesSet>
+                    </resourceSets>
                 </configuration>
             </plugin>
         </plugins>
     </build>
 
-    <!-- TODO add config for javadoc-jar -->
-
     <dependencies>
         <dependency>
+            <groupId>org.apache.deltaspike.core</groupId>
+            <artifactId>deltaspike-core-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.core</groupId>
+            <artifactId>deltaspike-core-impl</artifactId>
+            <scope>compile</scope>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-security-module-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.deltaspike.modules</groupId>
+            <artifactId>deltaspike-security-module-impl</artifactId>
+            <scope>runtime</scope>
+        </dependency>
+
+        <dependency>
             <groupId>org.apache.deltaspike.modules</groupId>
-            <artifactId>deltaspike-jsf-module-impl</artifactId>
+            <artifactId>deltaspike-jsf-module-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-el_2.2_spec</artifactId>
+            <version>1.0</version>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-servlet_3.0_spec</artifactId>
         </dependency>
     </dependencies>
 </project>

Reply via email to