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 2010/10/11 13:52:39 UTC
svn commit: r1021312 - in /myfaces/tobago/trunk: ./ tobago-core/
tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/
tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/
tobago-core/src/main/java/org/apache/myfaces/tobago/rende...
Author: bommel
Date: Mon Oct 11 11:52:38 2010
New Revision: 1021312
URL: http://svn.apache.org/viewvc?rev=1021312&view=rev
Log:
maven 3.0 fixes
update to checkstyle 5.0
hudson for ci mangement
improved deprecated documentation
Modified:
myfaces/tobago/trunk/pom.xml
myfaces/tobago/trunk/tobago-core/pom.xml
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Classes.java
myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UITreeOld.java
myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UITreeOldNode.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java
myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java
Modified: myfaces/tobago/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/pom.xml?rev=1021312&r1=1021311&r2=1021312&view=diff
==============================================================================
--- myfaces/tobago/trunk/pom.xml (original)
+++ myfaces/tobago/trunk/pom.xml Mon Oct 11 11:52:38 2010
@@ -38,8 +38,8 @@
<url>http://issues.apache.org/jira/secure/BrowseProject.jspa?id=12310273</url>
</issueManagement>
<ciManagement>
- <system>continuum</system>
- <url>http://myfaces.zones.apache.org:8080/continuum</url>
+ <system>hudson</system>
+ <url>https://hudson.apache.org/hudson/</url>
<notifiers>
<notifier>
<type>mail</type>
@@ -154,7 +154,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.3</version>
+ <version>2.6</version>
<configuration>
<configLocation>
http://svn.apache.org/repos/asf/myfaces/maven/trunk/build-tools/src/main/resources/org/apache/myfaces/tobago/checkstyle.xml
@@ -578,7 +578,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.3</version>
+ <version>2.6</version>
</plugin>
<plugin>
@@ -655,7 +655,6 @@
</plugin-->
<plugin>
<artifactId>maven-remote-resources-plugin</artifactId>
- <version>1.0</version>
<executions>
<execution>
<goals>
@@ -694,7 +693,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-checkstyle-plugin</artifactId>
- <version>2.3</version>
+ <version>2.6</version>
<configuration>
<configLocation>
http://svn.apache.org/repos/asf/myfaces/maven/trunk/build-tools/src/main/resources/org/apache/myfaces/tobago/checkstyle.xml
@@ -764,7 +763,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-compiler-plugin</artifactId>
- <version>2.0.2</version>
+ <version>2.3.2</version>
<configuration>
<source>${maven.compile.source}</source>
<target>${maven.compile.target}</target>
@@ -907,7 +906,7 @@
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-release-plugin</artifactId>
- <version>2.0-beta-9</version>
+ <version>2.1</version>
<configuration>
<tagBase>https://svn.apache.org/repos/asf/myfaces/tobago/tags</tagBase>
<preparationGoals>clean install</preparationGoals>
Modified: myfaces/tobago/trunk/tobago-core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/pom.xml?rev=1021312&r1=1021311&r2=1021312&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-core/pom.xml Mon Oct 11 11:52:38 2010
@@ -157,6 +157,7 @@
<include>org/apache/myfaces/tobago/component/UIDatePicker*</include>
</includes>
<excludes>
+ <exclude>test</exclude>
</excludes>
</configuration>
</execution>
@@ -199,6 +200,19 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-jar-plugin</artifactId>
<version>2.2</version>
+ <executions>
+ <execution>
+ <id>test-jar</id>
+ <goals>
+ <goal>test-jar</goal>
+ </goals>
+ </execution>
+ <execution>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ </execution>
+ </executions>
<configuration>
<excludes>
<exclude>org/apache/myfaces/tobago/internal/taglib/component/*Declaration.class</exclude>
@@ -224,17 +238,6 @@
</configuration>
</plugin>
<plugin>
- <groupId>org.apache.maven.plugins</groupId>
- <artifactId>maven-jar-plugin</artifactId>
- <executions>
- <execution>
- <goals>
- <goal>test-jar</goal>
- </goals>
- </execution>
- </executions>
- </plugin>
- <plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-source-plugin</artifactId>
<executions>
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java?rev=1021312&r1=1021311&r2=1021312&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/AbstractRendererBaseWrapper.java Mon Oct 11 11:52:38 2010
@@ -19,7 +19,6 @@ package org.apache.myfaces.tobago.render
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
-import org.apache.myfaces.tobago.config.ThemeConfig;
import org.apache.myfaces.tobago.context.ResourceManagerFactory;
import javax.faces.component.UIComponent;
@@ -60,13 +59,7 @@ public abstract class AbstractRendererBa
public final void decode(FacesContext facesContext, UIComponent component) {
getRenderer(facesContext).decode(facesContext, component);
}
-
- @Deprecated
- @Override
- public final int getConfiguredValue(FacesContext facesContext, UIComponent component, String key) {
- return ThemeConfig.getValue(facesContext, component, key);
- }
-
+
@Override
protected final Object getCurrentValueAsObject(UIInput input) {
return getRenderer(FacesContext.getCurrentInstance()).getCurrentValueAsObject(input);
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Classes.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Classes.java?rev=1021312&r1=1021311&r2=1021312&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Classes.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/css/Classes.java Mon Oct 11 11:52:38 2010
@@ -147,7 +147,7 @@ public final class Classes {
}
/**
- * @deprecated
+ * @deprecated This workaround will be removed later
*/
@Deprecated
public static Classes createWorkaround(String rendererName, String sub, Markup explicit) {
@@ -155,7 +155,7 @@ public final class Classes {
}
/**
- * @deprecated
+ * @deprecated This workaround will be removed later
*/
@Deprecated
public static Classes createWorkaround(String rendererName, Markup explicit) {
Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java?rev=1021312&r1=1021311&r2=1021312&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/renderkit/html/StyleClasses.java Mon Oct 11 11:52:38 2010
@@ -85,11 +85,16 @@ public class StyleClasses implements Ser
return new StyleClasses(ensureStyleClasses(component));
}
+ /**
+ * @deprecated since Tobago 1.5.0. Please use {@link org.apache.myfaces.tobago.renderkit.css.Classes}.
+ */
@Deprecated
public void addFullQualifiedClass(String clazz) {
classes.add(clazz);
}
-
+ /**
+ * @deprecated since Tobago 1.5.0. Please use {@link org.apache.myfaces.tobago.renderkit.css.Classes}.
+ */
@Deprecated
public void removeFullQualifiedClass(String clazz) {
classes.remove(clazz);
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java?rev=1021312&r1=1021311&r2=1021312&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/ajax/api/AjaxUtils.java Mon Oct 11 11:52:38 2010
@@ -26,7 +26,7 @@ import java.io.IOException;
import java.util.Map;
/**
- * @deprecated
+ * @deprecated since 1.5.0.
*/
@Deprecated
public class AjaxUtils {
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UITreeOld.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UITreeOld.java?rev=1021312&r1=1021311&r2=1021312&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UITreeOld.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UITreeOld.java Mon Oct 11 11:52:38 2010
@@ -48,8 +48,9 @@ import java.io.Serializable;
import java.util.Iterator;
import java.util.Set;
-import static org.apache.myfaces.tobago.TobagoConstants.ATTR_TAB_INDEX;
-
+/**
+ * @deprecated since 1.5.0. Replaced with new Tree.
+ */
@Deprecated
public class UITreeOld extends javax.faces.component.UIInput implements NamingContainer, ActionSource {
@@ -505,7 +506,7 @@ public class UITreeOld extends javax.fac
if (tabIndex != null) {
return tabIndex;
}
- ValueBinding vb = getValueBinding(ATTR_TAB_INDEX);
+ ValueBinding vb = getValueBinding(TobagoConstants.ATTR_TAB_INDEX);
if (vb != null) {
Number number = (Number) vb.getValue(getFacesContext());
if (number != null) {
Modified: myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UITreeOldNode.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UITreeOldNode.java?rev=1021312&r1=1021311&r2=1021312&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UITreeOldNode.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-deprecation/src/main/java/org/apache/myfaces/tobago/component/UITreeOldNode.java Mon Oct 11 11:52:38 2010
@@ -29,6 +29,9 @@ import javax.swing.tree.DefaultMutableTr
import javax.swing.tree.TreeNode;
import java.util.Map;
+/**
+ * @deprecated since 1.5.0. Replaced with new Tree.
+ */
@Deprecated
public class UITreeOldNode extends javax.faces.component.UIInput {
Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java?rev=1021312&r1=1021311&r2=1021312&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/event/TabChangeEvent.java Mon Oct 11 11:52:38 2010
@@ -38,7 +38,10 @@ public class TabChangeEvent extends Acti
this.oldTabIndex = oldTabIndex;
this.newTabIndex = newTabIndex;
}
-
+
+ /**
+ * @deprecated Please use {@link TabChangeEvent(UIComponent, Integer, Integer)}
+ */
@Deprecated
public TabChangeEvent(UIComponent uiComponent, Object oldState, Object newState) {
super(uiComponent);
@@ -64,21 +67,33 @@ public class TabChangeEvent extends Acti
return newTabIndex;
}
+ /**
+ * @deprecated Please use {@link #getOldTabIndex()}
+ */
@Deprecated
public Object getOldState() {
return oldTabIndex;
}
+ /**
+ * @deprecated Not supported anymore
+ */
@Deprecated
public void setOldState(Object oldTabIndex) {
this.oldTabIndex = oldTabIndex instanceof Integer ? (Integer) oldTabIndex : -1;
}
+ /**
+ * @deprecated Please use {@link #getNewTabIndex()}
+ */
@Deprecated
public Object getNewState() {
return newTabIndex;
}
+ /**
+ * @deprecated Not supported anymore
+ */
@Deprecated
public void setNewState(Object newTabIndex) {
this.newTabIndex = newTabIndex instanceof Integer ? (Integer) newTabIndex : -1;
Modified: myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java?rev=1021312&r1=1021311&r2=1021312&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java (original)
+++ myfaces/tobago/trunk/tobago-jsf-compat/src/main/java/org/apache/myfaces/tobago/internal/taglib/TobagoELTag.java Mon Oct 11 11:52:38 2010
@@ -56,6 +56,10 @@ public abstract class TobagoELTag extend
return StringUtils.split(renderers, ", ");
}
+ /**
+ *
+ * @deprecated Not supported anymore
+ */
@Deprecated
protected String getBodyContentStr() {
String content = bodyContent.getString();
@@ -63,6 +67,10 @@ public abstract class TobagoELTag extend
return content;
}
+ /**
+ *
+ * @deprecated Not supported anymore
+ */
@Deprecated
protected boolean isBodyContentEmpty() {
if (bodyContent != null) {