You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lu...@apache.org on 2014/04/10 13:58:48 UTC
svn commit: r1586275 - in /myfaces/orchestra/trunk/core22: ./
src/main/java/org/apache/myfaces/orchestra/annotation/spring/
src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/
Author: lu4242
Date: Thu Apr 10 11:58:47 2014
New Revision: 1586275
URL: http://svn.apache.org/r1586275
Log:
replace shared_orchestra from 2.0.x to shared 4.2.1 with maven shade plugin
Modified:
myfaces/orchestra/trunk/core22/pom.xml
myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/annotation/spring/AnnotationsInfoInitializer.java
myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/AbstractConversationTag.java
myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/SeparateConversationContextTag.java
myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UIEndConversation.java
myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UISeparateConversationContext.java
Modified: myfaces/orchestra/trunk/core22/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core22/pom.xml?rev=1586275&r1=1586274&r2=1586275&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core22/pom.xml (original)
+++ myfaces/orchestra/trunk/core22/pom.xml Thu Apr 10 11:58:47 2014
@@ -27,15 +27,13 @@
<artifactId>myfaces-api</artifactId>
<version>2.2.0</version>
<scope>provided</scope>
- <optional>true</optional>
</dependency>
+ <!-- This library is shaded! -->
<dependency>
- <groupId>org.apache.myfaces.shared</groupId>
- <artifactId>myfaces-shared-orchestra</artifactId>
- <version>${myfaces-orchestra-shared.version}</version>
- <scope>provided</scope>
- <!-- because we add all classes to the jar directly -->
+ <groupId>org.apache.myfaces.core.internal</groupId>
+ <artifactId>myfaces-impl-shared</artifactId>
+ <version>2.2.1</version>
</dependency>
<dependency>
@@ -142,51 +140,42 @@
</goals>
</execution>
</executions>
- </plugin>
- <plugin>
- <artifactId>maven-dependency-plugin</artifactId>
- <executions>
- <execution>
- <!-- unpack the shared sources into target/shared_sources-->
- <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-orchestra</artifactId>
- <version>${myfaces-orchestra-shared.version}</version>
- <classifier>sources</classifier>
- </artifactItem>
- </artifactItems>
- <excludes>META-INF/*</excludes>
- <outputDirectory>${project.build.directory}/shared_sources</outputDirectory>
- </configuration>
- </execution>
- </executions>
</plugin>
+
<plugin>
- <!-- the following will add the unpacked shared sources directory as source directory into the pom,
- so also the shared sources are automatically included by the attach source plugin -->
- <groupId>org.codehaus.mojo</groupId>
- <artifactId>build-helper-maven-plugin</artifactId>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-shade-plugin</artifactId>
+ <version>2.1</version>
<executions>
- <execution>
- <id>add-source</id>
- <phase>generate-sources</phase>
- <goals>
- <goal>add-source</goal>
- </goals>
- <configuration>
- <sources>
- <source>${project.build.directory}/shared_sources</source>
- </sources>
- </configuration>
- </execution>
+ <execution>
+ <phase>package</phase>
+ <goals>
+ <goal>shade</goal>
+ </goals>
+ </execution>
</executions>
+ <configuration>
+ <minimizeJar>true</minimizeJar>
+ <artifactSet>
+ <includes>
+ <include>org.apache.myfaces.core.internal:myfaces-impl-shared</include>
+ </includes>
+ </artifactSet>
+ <relocations>
+ <relocation>
+ <pattern>org.apache.myfaces.shared</pattern>
+ <shadedPattern>org.apache.myfaces.shared_orchestra</shadedPattern>
+ </relocation>
+ </relocations>
+ <filters>
+ <filter>
+ <artifact>org.apache.myfaces.core.internal:myfaces-impl-shared</artifact>
+ <excludes>
+ <exclude>META-INF/**</exclude>
+ </excludes>
+ </filter>
+ </filters>
+ </configuration>
</plugin>
<plugin>
Modified: myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/annotation/spring/AnnotationsInfoInitializer.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/annotation/spring/AnnotationsInfoInitializer.java?rev=1586275&r1=1586274&r2=1586275&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/annotation/spring/AnnotationsInfoInitializer.java (original)
+++ myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/annotation/spring/AnnotationsInfoInitializer.java Thu Apr 10 11:58:47 2014
@@ -25,7 +25,7 @@ import org.apache.myfaces.orchestra.anno
import org.apache.myfaces.orchestra.conversation.annotations.ConversationName;
import org.apache.myfaces.orchestra.conversation.spring.BeanDefinitionConversationNameAttrDecorator;
import org.apache.myfaces.orchestra.conversation.spring._SpringUtils;
-import org.apache.myfaces.shared_orchestra.util.ClassUtils;
+import org.apache.myfaces.shared.util.ClassUtils;
import org.springframework.beans.BeansException;
import org.springframework.beans.factory.config.BeanDefinition;
import org.springframework.beans.factory.config.BeanFactoryPostProcessor;
Modified: myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/AbstractConversationTag.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/AbstractConversationTag.java?rev=1586275&r1=1586274&r2=1586275&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/AbstractConversationTag.java (original)
+++ myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/AbstractConversationTag.java Thu Apr 10 11:58:47 2014
@@ -19,14 +19,14 @@
package org.apache.myfaces.orchestra.conversation.jsf.components;
-import org.apache.myfaces.shared_orchestra.taglib.UIComponentTagBase;
+import org.apache.myfaces.shared.taglib.UIComponentELTagBase;
import javax.faces.component.UIComponent;
/**
* base class for all conversation tags
*/
-public abstract class AbstractConversationTag extends UIComponentTagBase
+public abstract class AbstractConversationTag extends UIComponentELTagBase
{
private String name;
Modified: myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/SeparateConversationContextTag.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/SeparateConversationContextTag.java?rev=1586275&r1=1586274&r2=1586275&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/SeparateConversationContextTag.java (original)
+++ myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/SeparateConversationContextTag.java Thu Apr 10 11:58:47 2014
@@ -19,14 +19,14 @@
package org.apache.myfaces.orchestra.conversation.jsf.components;
-import org.apache.myfaces.shared_orchestra.taglib.UIComponentTagBase;
+import org.apache.myfaces.shared.taglib.UIComponentELTagBase;
/**
* Embedded links will start a new conversation context
*
* @see org.apache.myfaces.orchestra.conversation.jsf.components.UISeparateConversationContext
*/
-public class SeparateConversationContextTag extends UIComponentTagBase
+public class SeparateConversationContextTag extends UIComponentELTagBase
{
public String getComponentType()
{
Modified: myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UIEndConversation.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UIEndConversation.java?rev=1586275&r1=1586274&r2=1586275&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UIEndConversation.java (original)
+++ myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UIEndConversation.java Thu Apr 10 11:58:47 2014
@@ -31,7 +31,7 @@ import javax.faces.el.ValueBinding;
import org.apache.myfaces.orchestra.conversation.ConversationUtils;
import org.apache.myfaces.orchestra.conversation.jsf._JsfConversationUtils;
import org.apache.myfaces.orchestra.conversation.jsf.lib._EndConversationMethodBindingFacade;
-import org.apache.myfaces.shared_orchestra.util.StringUtils;
+import org.apache.myfaces.shared.util.StringUtils;
/**
* Can be used to end a manual-scope conversation, and optionally handles exceptions thrown
Modified: myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UISeparateConversationContext.java
URL: http://svn.apache.org/viewvc/myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UISeparateConversationContext.java?rev=1586275&r1=1586274&r2=1586275&view=diff
==============================================================================
--- myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UISeparateConversationContext.java (original)
+++ myfaces/orchestra/trunk/core22/src/main/java/org/apache/myfaces/orchestra/conversation/jsf/components/UISeparateConversationContext.java Thu Apr 10 11:58:47 2014
@@ -25,7 +25,7 @@ import javax.faces.component.UIComponent
import javax.faces.context.FacesContext;
import org.apache.myfaces.orchestra.conversation.ConversationRequestParameterProvider;
-import org.apache.myfaces.shared_orchestra.renderkit.RendererUtils;
+import org.apache.myfaces.shared.renderkit.RendererUtils;
/**
* Embedded links will start a new conversation context.