You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by bo...@apache.org on 2011/10/30 10:15:02 UTC
svn commit: r1195135 - in
/myfaces/tobago/trunk/tobago-example/tobago-example-demo: ./
src/main/java/org/apache/myfaces/tobago/example/demo/
src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/
src/main/java/org/apache/myfaces/tobago/ex...
Author: bommel
Date: Sun Oct 30 09:15:02 2011
New Revision: 1195135
URL: http://svn.apache.org/viewvc?rev=1195135&view=rev
Log:
minor improvements
moved jsf12 and jsf20 artifacts to myfaces-1.2 and myfaces-2.0 profile
update openwebbeans version
Modified:
myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SynchronizeNavigationPhaseListener.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/SimpleTabChangeListener.java
myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityPhaseListener.java
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml?rev=1195135&r1=1195134&r2=1195135&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/pom.xml Sun Oct 30 09:15:02 2011
@@ -97,6 +97,17 @@
</transformationSets>
</configuration>
</plugin>
+ <plugin>
+ <!-- TODO test glassfish -->
+ <groupId>org.glassfish</groupId>
+ <artifactId>maven-embedded-glassfish-plugin</artifactId>
+ <version>3.1.1</version>
+ <configuration>
+ <port>8080</port>
+ <contextRoot>/</contextRoot>
+ <autoDelete>true</autoDelete>
+ </configuration>
+ </plugin>
</plugins>
</build>
@@ -133,14 +144,6 @@
</dependency>
<dependency>
<groupId>org.apache.openwebbeans</groupId>
- <artifactId>openwebbeans-jsf12</artifactId>
-<!-- for JSF 2.0 todo: make a profile
- <artifactId>openwebbeans-jsf</artifactId>
--->
- <version>${openwebbeans.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.openwebbeans</groupId>
<artifactId>openwebbeans-web</artifactId>
<version>${openwebbeans.version}</version>
</dependency>
@@ -149,13 +152,6 @@
<artifactId>openwebbeans-resource</artifactId>
<version>${openwebbeans.version}</version>
</dependency>
- <!--
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi</groupId>
- <artifactId>myfaces-extcdi-dist-jsf12</artifactId>
- <version>0.9.4</version>
- </dependency>
--->
<dependency>
<groupId>org.apache.myfaces.extensions.cdi.core</groupId>
@@ -170,25 +166,6 @@
<version>${myfaces-extcdi.version}</version>
<scope>runtime</scope>
</dependency>
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf12-module-api</artifactId>
-<!-- for JSF 2.0 todo: make a profile
- <artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
--->
- <version>${myfaces-extcdi.version}</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
- <artifactId>myfaces-extcdi-jsf12-module-impl</artifactId>
-<!-- for JSF 2.0 todo: make a profile
- <artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
--->
- <version>${myfaces-extcdi.version}</version>
- <scope>runtime</scope>
- </dependency>
<!-- which repository-->
<dependency>
@@ -301,32 +278,15 @@
<scope>compile</scope>
</dependency>
-->
- <dependency>
+ <!--dependency>
<groupId>com.sun.el</groupId>
<artifactId>el-ri</artifactId>
<version>1.0</version>
- <scope>test</scope>
+ <scope>test</scope-->
<!-- needed for Tomcat 5.5, TODO: make a JavaEE4 profile
<scope>compile</scope>
-->
- </dependency>
-
-<!--
- for JSF 2.0 and Bean Validation (JSR-303)
- todo: make a profile
- <dependency>
- <groupId>javax.el</groupId>
- <artifactId>el-api</artifactId>
- <version>2.2</version>
- <scope>compile</scope>
- </dependency>
-
- <dependency>
- <groupId>org.glassfish.web</groupId>
- <artifactId>el-impl</artifactId>
- <version>2.2</version>
- </dependency>
--->
+ <!--/dependency-->
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
@@ -354,6 +314,82 @@
</repositories>
<profiles>
<profile>
+ <id>myfaces-2.0</id>
+ <activation>
+ <property>
+ <name>jsf</name>
+ <value>myfaces-2.0</value>
+ </property>
+ </activation>
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf</artifactId>
+ <version>${openwebbeans.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
+ <artifactId>myfaces-extcdi-jsf20-module-api</artifactId>
+ <version>${myfaces-extcdi.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
+ <artifactId>myfaces-extcdi-jsf20-module-impl</artifactId>
+ <version>${myfaces-extcdi.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+<!-- for JSF 2.0 and Bean Validation (JSR-303) -->
+ <dependency>
+ <groupId>javax.el</groupId>
+ <artifactId>el-api</artifactId>
+ <version>2.2</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.glassfish.web</groupId>
+ <artifactId>el-impl</artifactId>
+ <version>2.2</version>
+ </dependency>
+
+ </dependencies>
+ </profile>
+
+ <profile>
+ <id>myfaces-1.2</id>
+ <activation>
+ <property>
+ <name>!jsf</name>
+ </property>
+ </activation>
+ <dependencies>
+
+ <dependency>
+ <groupId>org.apache.openwebbeans</groupId>
+ <artifactId>openwebbeans-jsf12</artifactId>
+ <version>${openwebbeans.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
+ <artifactId>myfaces-extcdi-jsf12-module-api</artifactId>
+ <version>${myfaces-extcdi.version}</version>
+ <scope>compile</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.myfaces.extensions.cdi.modules</groupId>
+ <artifactId>myfaces-extcdi-jsf12-module-impl</artifactId>
+ <version>${myfaces-extcdi.version}</version>
+ <scope>runtime</scope>
+ </dependency>
+
+ </dependencies>
+ </profile>
+ <profile>
<id>ssl</id>
<build>
<plugins>
@@ -390,7 +426,7 @@
<container>
<containerId>tomcat6x</containerId>
<zipUrlInstaller>
- <url>http://apache.easy-webs.de/tomcat/tomcat-6/v6.0.20/bin/apache-tomcat-6.0.20.zip</url>
+ <url>http://archive.apache.org/dist/tomcat/tomcat-6/v6.0.33/bin/apache-tomcat-6.0.33.zip</url>
<installDir>${project.build.directory}/tomcat6</installDir>
</zipUrlInstaller>
</container>
@@ -417,7 +453,7 @@
<container>
<containerId>tomcat5x</containerId>
<zipUrlInstaller>
- <url>http://apache.easy-webs.de/tomcat/tomcat-5/v5.5.28/bin/apache-tomcat-5.5.28.zip</url>
+ <url>http://archive.apache.org/dist/tomcat/tomcat-5/v5.5.33/bin/apache-tomcat-5.5.33.zip</url>
<installDir>${project.build.directory}/tomcat5</installDir>
</zipUrlInstaller>
</container>
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SynchronizeNavigationPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SynchronizeNavigationPhaseListener.java?rev=1195135&r1=1195134&r2=1195135&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SynchronizeNavigationPhaseListener.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/SynchronizeNavigationPhaseListener.java Sun Oct 30 09:15:02 2011
@@ -34,7 +34,7 @@ public class SynchronizeNavigationPhaseL
// synchronizing direct links with controller
FacesContext facesContext = FacesContext.getCurrentInstance();
UIViewRoot viewRoot = facesContext.getViewRoot();
- if (viewRoot.getChildCount() == 0) { // in case of direct links the ViewRoot is empty after "restore view".
+ if (viewRoot != null && viewRoot.getChildCount() == 0) { // in case of direct links the ViewRoot is empty after "restore view".
String viewId = viewRoot.getViewId();
Navigation navigation = (Navigation) VariableResolverUtils.resolveVariable(facesContext, "navigation");
navigation.selectByViewId(viewId);
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/SimpleTabChangeListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/SimpleTabChangeListener.java?rev=1195135&r1=1195134&r2=1195135&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/SimpleTabChangeListener.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/actionlistener/SimpleTabChangeListener.java Sun Oct 30 09:15:02 2011
@@ -17,10 +17,10 @@ package org.apache.myfaces.tobago.exampl
* limitations under the License.
*/
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
import org.apache.myfaces.tobago.event.TabChangeEvent;
import org.apache.myfaces.tobago.event.TabChangeListener;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
/**
* User: weber
@@ -37,7 +37,7 @@ public class SimpleTabChangeListener imp
}
public void processTabChange(TabChangeEvent tabChangeEvent) {
- LOG.error("TabState has Changed: from tabIndex " + tabChangeEvent.getOldState()
+ LOG.error("TabState has Changed: from tabIndex " + tabChangeEvent.getOldTabIndex()
+ " to tabIndex " + tabChangeEvent.getNewTabIndex()+ " " + this);
}
Modified: myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityPhaseListener.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityPhaseListener.java?rev=1195135&r1=1195134&r2=1195135&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityPhaseListener.java (original)
+++ myfaces/tobago/trunk/tobago-example/tobago-example-demo/src/main/java/org/apache/myfaces/tobago/example/demo/info/ActivityPhaseListener.java Sun Oct 30 09:15:02 2011
@@ -33,7 +33,6 @@ public class ActivityPhaseListener imple
private static final Log LOG = LogFactory.getLog(ActivityPhaseListener.class);
public ActivityPhaseListener() {
- LOG.error("Hier bin ich!");
}
public void afterPhase(PhaseEvent event) {