You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/02/20 21:32:41 UTC
svn commit: r1448380 - in /myfaces/tobago/trunk/tobago-extension: ./
tobago-sandbox/
tobago-sandbox/src/main/java/org/apache/myfaces/tobago/component/
tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/
tobago-sandbox/src/main/ja...
Author: lofwyr
Date: Wed Feb 20 20:32:41 2013
New Revision: 1448380
URL: http://svn.apache.org/r1448380
Log:
TOBAGO-1212: Using JSR 269: Pluggable Annotation Processing API
- fix generation in the sandbox
Added:
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUINumberSlider.java
- copied, changed from r1446469, myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUINumberSlider.java
Removed:
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUINumberSlider.java
Modified:
myfaces/tobago/trunk/tobago-extension/pom.xml
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/NumberSliderTagDeclaration.java
myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
Modified: myfaces/tobago/trunk/tobago-extension/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/pom.xml?rev=1448380&r1=1448379&r2=1448380&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/pom.xml Wed Feb 20 20:32:41 2013
@@ -30,9 +30,7 @@
<module>tobago-deprecation</module>
<module>tobago-facelets</module>
<module>tobago-fileupload</module>
-<!-- XXX: disabled, because of a problem while code generation
<module>tobago-sandbox</module>
--->
<module>tobago-security</module>
<module>tobago-taglib-extension</module>
</modules>
Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml?rev=1448380&r1=1448379&r2=1448380&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/pom.xml Wed Feb 20 20:32:41 2013
@@ -29,12 +29,12 @@
<build>
<plugins>
-<!-- TBD: can this be removed? -->
-<!--
<plugin>
<groupId>org.codehaus.mojo</groupId>
<artifactId>build-helper-maven-plugin</artifactId>
+<!--
<version>1.0</version>
+-->
<executions>
<execution>
<id>add-source</id>
@@ -44,14 +44,12 @@
</goals>
<configuration>
<sources>
- <source>${project.build.directory}/generated-component</source>
+ <source>${project.build.directory}/generated</source>
</sources>
</configuration>
</execution>
</executions>
</plugin>
--->
- <!-- TBD: can this be removed? -->
<plugin>
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-dependency-plugin</artifactId>
@@ -89,6 +87,9 @@
<phase>generate-sources</phase>
<configuration>
<!-- source output directory -->
+ <additionalSourceDirectories>
+ <additionalSourceDirectory>${project.build.directory}/tobago-core-sources</additionalSourceDirectory>
+ </additionalSourceDirectories>
<outputDirectory>${project.build.directory}/generated</outputDirectory>
<processors>
<processor>org.apache.myfaces.tobago.apt.processor.ClassesGenerator</processor>
@@ -155,29 +156,19 @@
<artifactId>maven-resources-plugin</artifactId>
<executions>
<execution>
- <id>copy-faces-config</id>
- <goals><goal>copy-resources</goal></goals>
- <phase>process-classes</phase>
- <configuration>
- <outputDirectory>${project.build.outputDirectory}</outputDirectory>
- <resources>
- <resource>
- <targetPath>META-INF</targetPath>
- <directory>${project.build.directory}/generated-faces-config</directory>
- </resource>
- </resources>
- </configuration>
- </execution>
- <execution>
- <id>copy-tld</id>
+ <id>copy-resources</id>
<goals><goal>copy-resources</goal></goals>
<phase>process-classes</phase>
<configuration>
<outputDirectory>${project.build.outputDirectory}</outputDirectory>
<resources>
<resource>
- <targetPath>META-INF</targetPath>
- <directory>${project.build.directory}/generated-tld</directory>
+ <directory>${project.build.directory}/generated</directory>
+ <includes>
+ <include>**/*.tld</include>
+ <include>**/tobago-sandbox.xml</include>
+ <include>META-INF/faces-config.xml</include>
+ </includes>
</resource>
</resources>
</configuration>
@@ -225,11 +216,6 @@
<groupId>org.apache.myfaces.tobago</groupId>
<artifactId>tobago-core</artifactId>
<version>${project.version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.myfaces.tobago</groupId>
- <artifactId>tobago-core</artifactId>
- <version>${project.version}</version>
<classifier>tests</classifier>
<scope>test</scope>
</dependency>
@@ -284,8 +270,7 @@
</dependency>
<dependency>
<groupId>org.apache.myfaces.test</groupId>
- <artifactId>myfaces-test12</artifactId>
- <version>${myfaces-test12.version}</version>
+ <artifactId>myfaces-test20</artifactId>
<scope>test</scope>
</dependency>
</dependencies>
Copied: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUINumberSlider.java (from r1446469, myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUINumberSlider.java)
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUINumberSlider.java?p2=myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUINumberSlider.java&p1=myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUINumberSlider.java&r1=1446469&r2=1448380&rev=1448380&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/component/AbstractUINumberSlider.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/component/AbstractUINumberSlider.java Wed Feb 20 20:32:41 2013
@@ -17,7 +17,7 @@
* under the License.
*/
-package org.apache.myfaces.tobago.component;
+package org.apache.myfaces.tobago.internal.component;
import org.apache.myfaces.tobago.layout.LayoutComponent;
Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/NumberSliderTagDeclaration.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/NumberSliderTagDeclaration.java?rev=1448380&r1=1448379&r2=1448380&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/NumberSliderTagDeclaration.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/internal/taglib/sandbox/NumberSliderTagDeclaration.java Wed Feb 20 20:32:41 2013
@@ -32,12 +32,18 @@ import org.apache.myfaces.tobago.interna
import org.apache.myfaces.tobago.internal.taglib.declaration.IsGridLayoutComponent;
import org.apache.myfaces.tobago.internal.taglib.declaration.IsReadonly;
+import javax.faces.component.UIInput;
+
+/**
+ * Renders a slider to select a number in a range.
+ */
@Tag(name = "numberSlider")
@UIComponentTag(
uiComponent = "org.apache.myfaces.tobago.component.UINumberSlider",
- uiComponentBaseClass = "org.apache.myfaces.tobago.component.AbstractUINumberSlider",
+ uiComponentBaseClass = "org.apache.myfaces.tobago.internal.component.AbstractUINumberSlider",
+ uiComponentFacesClass = "javax.faces.component.UIInput",
+ componentFamily = UIInput.COMPONENT_FAMILY,
rendererType = "NumberSlider")
-
public interface NumberSliderTagDeclaration
extends HasIdBindingAndRendered, IsReadonly, IsDisabled, HasMarkup, HasCurrentMarkup,
HasValue, HasValueChangeListener, IsGridLayoutComponent {
Modified: myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java?rev=1448380&r1=1448379&r2=1448380&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java (original)
+++ myfaces/tobago/trunk/tobago-extension/tobago-sandbox/src/main/java/org/apache/myfaces/tobago/renderkit/html/sandbox/standard/tag/NumberSliderRenderer.java Wed Feb 20 20:32:41 2013
@@ -19,7 +19,7 @@
package org.apache.myfaces.tobago.renderkit.html.sandbox.standard.tag;
-import org.apache.myfaces.tobago.component.AbstractUINumberSlider;
+import org.apache.myfaces.tobago.internal.component.AbstractUINumberSlider;
import org.apache.myfaces.tobago.context.ResourceManagerUtils;
import org.apache.myfaces.tobago.layout.Measure;
import org.apache.myfaces.tobago.renderkit.LayoutComponentRendererBase;