You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tiles.apache.org by ap...@apache.org on 2007/03/02 14:50:19 UTC
svn commit: r513762 - in /tiles/framework/trunk: ./ assembly/
assembly/src/main/assembly/ tiles-core/
tiles-core/src/main/java/org/apache/tiles/
tiles-core/src/main/java/org/apache/tiles/context/
tiles-core/src/main/java/org/apache/tiles/context/jsp/ t...
Author: apetrelli
Date: Fri Mar 2 05:50:16 2007
New Revision: 513762
URL: http://svn.apache.org/viewvc?view=rev&rev=513762
Log:
TILES-95
Created "tiles-jsp" module and added to parent pom and in assembly.
Moved ComponentConstants to "org.apache.tiles" package.
Now JSP-related classes need a bit of refactoring.
Added:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/ComponentConstants.java
- copied, changed from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/ComponentConstants.java
tiles/framework/trunk/tiles-jsp/
tiles/framework/trunk/tiles-jsp/pom.xml (with props)
tiles/framework/trunk/tiles-jsp/src/
tiles/framework/trunk/tiles-jsp/src/main/
tiles/framework/trunk/tiles-jsp/src/main/java/
tiles/framework/trunk/tiles-jsp/src/main/java/org/
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/context/
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/context/jsp/
- copied from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/jsp/
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/context/jsp/JspTilesContextFactory.java
- copied unchanged from r513717, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesContextFactory.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java
- copied unchanged from r513717, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspTilesRequestContext.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/context/jsp/JspUtil.java
- copied unchanged from r513717, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspUtil.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/context/jsp/JspWriterResponse.java
- copied unchanged from r513717, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/jsp/JspWriterResponse.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddAttributeTag.java
- copied, changed from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/AddAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddAttributeTagParent.java
- copied unchanged from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/AddAttributeTagParent.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddListAttributeTag.java
- copied unchanged from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/AddListAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java
- copied, changed from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java
- copied unchanged from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/GetAsStringTag.java
- copied unchanged from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/GetAsStringTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/ImportAttributeTag.java
- copied unchanged from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/ImportAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java
- copied unchanged from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/InsertDefinitionTag.java
- copied unchanged from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertDefinitionTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/InsertTemplateTag.java
- copied unchanged from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTemplateTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java
- copied, changed from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutAttributeTagParent.java
- copied unchanged from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutAttributeTagParent.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutListAttributeTag.java
- copied unchanged from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutListAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java
- copied unchanged from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/UseAttributeTag.java
- copied unchanged from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/UseAttributeTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/definition/
- copied from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/definition/
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/definition/DefinitionTag.java
- copied unchanged from r513717, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/definition/DefinitionTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/definition/DestroyContainerTag.java
- copied unchanged from r513717, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/definition/DestroyContainerTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/definition/InitContainerTag.java
- copied unchanged from r513717, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/definition/InitContainerTag.java
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/doc-files/
- copied from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/doc-files/
tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/package.html
- copied unchanged from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/package.html
tiles/framework/trunk/tiles-jsp/src/main/resources/
tiles/framework/trunk/tiles-jsp/src/main/resources/LICENSE.txt (with props)
tiles/framework/trunk/tiles-jsp/src/main/resources/META-INF/
- copied from r513714, tiles/framework/trunk/tiles-core/src/main/resources/META-INF/
tiles/framework/trunk/tiles-jsp/src/main/resources/META-INF/tld/
- copied from r513717, tiles/framework/trunk/tiles-core/src/main/resources/META-INF/tld/
tiles/framework/trunk/tiles-jsp/src/main/resources/NOTICE.txt (with props)
Removed:
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/jsp/
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/AddAttributeTag.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/AddAttributeTagParent.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/AddListAttributeTag.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/ComponentConstants.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/ContainerTagSupport.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/GetAsStringTag.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/ImportAttributeTag.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertAttributeTag.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertDefinitionTag.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/InsertTemplateTag.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutAttributeTagParent.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutListAttributeTag.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/RenderTagSupport.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/UseAttributeTag.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/definition/
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/doc-files/
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/package.html
tiles/framework/trunk/tiles-core/src/main/resources/META-INF/
Modified:
tiles/framework/trunk/assembly/pom.xml
tiles/framework/trunk/assembly/src/main/assembly/bin.xml
tiles/framework/trunk/assembly/src/main/assembly/src.xml
tiles/framework/trunk/pom.xml
tiles/framework/trunk/tiles-core/pom.xml
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/BasicComponentContext.java
tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java
tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainerTest.java
tiles/framework/trunk/tiles-test/pom.xml
tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java
Modified: tiles/framework/trunk/assembly/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/pom.xml?view=diff&rev=513762&r1=513761&r2=513762
==============================================================================
--- tiles/framework/trunk/assembly/pom.xml (original)
+++ tiles/framework/trunk/assembly/pom.xml Fri Mar 2 05:50:16 2007
@@ -75,6 +75,12 @@
</dependency>
<dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-jsp</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
<groupId>commons-digester</groupId>
<artifactId>commons-digester</artifactId>
<version>1.8</version>
Modified: tiles/framework/trunk/assembly/src/main/assembly/bin.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/src/main/assembly/bin.xml?view=diff&rev=513762&r1=513761&r2=513762
==============================================================================
--- tiles/framework/trunk/assembly/src/main/assembly/bin.xml (original)
+++ tiles/framework/trunk/assembly/src/main/assembly/bin.xml Fri Mar 2 05:50:16 2007
@@ -27,6 +27,7 @@
<excludes>
<exclude>org.apache.tiles:tiles-api</exclude>
<exclude>org.apache.tiles:tiles-core</exclude>
+ <exclude>org.apache.tiles:tiles-jsp</exclude>
</excludes>
</dependencySet>
<dependencySet>
@@ -34,6 +35,7 @@
<includes>
<include>org.apache.tiles:tiles-api</include>
<include>org.apache.tiles:tiles-core</include>
+ <include>org.apache.tiles:tiles-jsp</include>
</includes>
</dependencySet>
</dependencySets>
Modified: tiles/framework/trunk/assembly/src/main/assembly/src.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/assembly/src/main/assembly/src.xml?view=diff&rev=513762&r1=513761&r2=513762
==============================================================================
--- tiles/framework/trunk/assembly/src/main/assembly/src.xml (original)
+++ tiles/framework/trunk/assembly/src/main/assembly/src.xml Fri Mar 2 05:50:16 2007
@@ -54,6 +54,14 @@
</includes>
</fileSet>
<fileSet>
+ <directory>../tiles-jsp</directory>
+ <outputDirectory>src/tiles-jsp</outputDirectory>
+ <includes>
+ <include>pom.xml</include>
+ <include>src/</include>
+ </includes>
+ </fileSet>
+ <fileSet>
<directory>../assembly</directory>
<outputDirectory>src/assembly</outputDirectory>
<includes>
Modified: tiles/framework/trunk/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/pom.xml?view=diff&rev=513762&r1=513761&r2=513762
==============================================================================
--- tiles/framework/trunk/pom.xml (original)
+++ tiles/framework/trunk/pom.xml Fri Mar 2 05:50:16 2007
@@ -25,6 +25,7 @@
<modules>
<module>tiles-api</module>
<module>tiles-core</module>
+ <module>tiles-jsp</module>
<module>tiles-test</module>
<module>assembly</module>
</modules>
Modified: tiles/framework/trunk/tiles-core/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/pom.xml?view=diff&rev=513762&r1=513761&r2=513762
==============================================================================
--- tiles/framework/trunk/tiles-core/pom.xml (original)
+++ tiles/framework/trunk/tiles-core/pom.xml Fri Mar 2 05:50:16 2007
@@ -182,10 +182,6 @@
<reporting>
<plugins>
<plugin>
- <groupId>net.sourceforge.maven-taglib</groupId>
- <artifactId>maven-taglib-plugin</artifactId>
- </plugin>
- <plugin>
<groupId>net.sf.dtddoc</groupId>
<artifactId>dtddoc-maven-plugin</artifactId>
<configuration>
Copied: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/ComponentConstants.java (from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/ComponentConstants.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/ComponentConstants.java?view=diff&rev=513762&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/ComponentConstants.java&r1=513714&p2=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/ComponentConstants.java&r2=513762
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/ComponentConstants.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/ComponentConstants.java Fri Mar 2 05:50:16 2007
@@ -20,7 +20,7 @@
*
*/
-package org.apache.tiles.taglib;
+package org.apache.tiles;
/**
* Constants used by Tiles/Components.
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/BasicComponentContext.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/BasicComponentContext.java?view=diff&rev=513762&r1=513761&r2=513762
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/BasicComponentContext.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/context/BasicComponentContext.java Fri Mar 2 05:50:16 2007
@@ -22,8 +22,8 @@
package org.apache.tiles.context;
-import org.apache.tiles.taglib.ComponentConstants;
import org.apache.tiles.context.TilesRequestContext;
+import org.apache.tiles.ComponentConstants;
import org.apache.tiles.ComponentContext;
import org.apache.tiles.ComponentAttribute;
Modified: tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java?view=diff&rev=513762&r1=513761&r2=513762
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java (original)
+++ tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/locale/impl/DefaultLocaleResolver.java Fri Mar 2 05:50:16 2007
@@ -24,10 +24,10 @@
import java.util.Locale;
import java.util.Map;
+import org.apache.tiles.ComponentConstants;
import org.apache.tiles.TilesException;
import org.apache.tiles.context.TilesRequestContext;
import org.apache.tiles.locale.LocaleResolver;
-import org.apache.tiles.taglib.ComponentConstants;
/**
* @version $Rev$ $Date$
Modified: tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainerTest.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainerTest.java?view=diff&rev=513762&r1=513761&r2=513762
==============================================================================
--- tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainerTest.java (original)
+++ tiles/framework/trunk/tiles-core/src/test/java/org/apache/tiles/impl/KeyedDefinitionsFactoryTilesContainerTest.java Fri Mar 2 05:50:16 2007
@@ -34,11 +34,11 @@
import junit.framework.TestCase;
+import org.apache.tiles.ComponentConstants;
import org.apache.tiles.TilesException;
import org.apache.tiles.definition.DefinitionsFactory;
import org.apache.tiles.factory.KeyedDefinitionsFactoryTilesContainerFactory;
import org.apache.tiles.factory.TilesContainerFactory;
-import org.apache.tiles.taglib.ComponentConstants;
import org.apache.tiles.util.RollingVectorEnumeration;
import org.easymock.EasyMock;
Added: tiles/framework/trunk/tiles-jsp/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/pom.xml?view=auto&rev=513762
==============================================================================
--- tiles/framework/trunk/tiles-jsp/pom.xml (added)
+++ tiles/framework/trunk/tiles-jsp/pom.xml Fri Mar 2 05:50:16 2007
@@ -0,0 +1,250 @@
+<?xml version="1.0"?>
+<!--
+/*
+ * $Id$
+ *
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
+ *
+ */
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <parent>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-parent</artifactId>
+ <version>2.0.2-SNAPSHOT</version>
+ </parent>
+
+ <modelVersion>4.0.0</modelVersion>
+ <artifactId>tiles-jsp</artifactId>
+ <packaging>jar</packaging>
+ <name>Tiles - JSP support</name>
+
+ <build>
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ </resource>
+ <resource>
+ <directory>src/main/resources</directory>
+ <includes>
+ <include>LICENSE.txt</include>
+ <include>NOTICE.txt</include>
+ </includes>
+ <targetPath>META-INF</targetPath>
+ </resource>
+ </resources>
+
+ <testResources>
+ <testResource>
+ <directory>src/test/java</directory>
+ <includes>
+ <include>**/*.xml</include>
+ <include>**/*.properties</include>
+ </includes>
+ </testResource>
+ </testResources>
+ <plugins>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <configuration>
+ <archive>
+ <manifest>
+ </manifest>
+ </archive>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ </build>
+
+ <profiles>
+
+ <profile>
+ <id>release</id>
+ <build>
+ <plugins>
+ <plugin>
+ <executions>
+ <execution>
+ <id>make-assembly</id>
+ <goals>
+ <goal>attached</goal>
+ </goals>
+ <phase>package</phase>
+ </execution>
+ </executions>
+ <artifactId>maven-assembly-plugin</artifactId>
+ <configuration>
+ <descriptors>
+ <descriptor>src/main/assembly/bin.xml</descriptor>
+ <descriptor>src/main/assembly/src.xml</descriptor>
+ </descriptors>
+ <tarLongFileMode>gnu</tarLongFileMode>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+
+
+ <profile>
+ <!--
+ Run the translator for Java 1.4 compatiblity
+
+ Sample:
+ $ cd struts/struts2/
+ $ mvn clean install -Papps,j4 -Djava14.jar=$JAVA_HOME/../Classes/classes.jar
+
+ -->
+ <id>j4</id>
+ <build>
+ <plugins>
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>retrotranslator-maven-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>retrotranslate</id>
+ </execution>
+ </executions>
+ </plugin>
+ <plugin>
+ <artifactId>maven-jar-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>create-j4-jar</id>
+ <goals>
+ <goal>jar</goal>
+ </goals>
+ <configuration>
+ <classesDirectory>${project.build.directory}/classes-retro</classesDirectory>
+ <classifier>j4</classifier>
+ <archive>
+ <manifestEntries>
+ <Extension-Name>${project.artifactId}-j4</Extension-Name>
+ <Specification-Vendor>${project.organization.name}</Specification-Vendor>
+ <Implementation-Vendor>${project.organization.name}</Implementation-Vendor>
+ <Implementation-Title>${project.description}</Implementation-Title>
+ <Implementation-Version>${project.version}</Implementation-Version>
+ <Revision>${scm.revision}</Revision>
+ </manifestEntries>
+ </archive>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+ </plugins>
+ </build>
+ <dependencies>
+ <dependency>
+ <groupId>sun.jdk</groupId>
+ <artifactId>rt</artifactId>
+ <version>1.4.0</version>
+ <scope>system</scope>
+ <!-- path to rt.jar (on OSX, it's classes.jar) -->
+ <systemPath>${java14.jar}</systemPath>
+ </dependency>
+ <dependency>
+ <groupId>net.sf.retrotranslator</groupId>
+ <artifactId>retrotranslator-runtime</artifactId>
+ <version>1.0.8</version>
+ </dependency>
+ </dependencies>
+ </profile>
+ </profiles>
+
+ <reporting>
+ <plugins>
+ <plugin>
+ <groupId>net.sourceforge.maven-taglib</groupId>
+ <artifactId>maven-taglib-plugin</artifactId>
+ </plugin>
+ </plugins>
+ </reporting>
+
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-api</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.tiles</groupId>
+ <artifactId>tiles-core</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-digester</groupId>
+ <artifactId>commons-digester</artifactId>
+ <version>1.8</version>
+ <exclusions>
+ <exclusion>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>commons-logging</groupId>
+ <artifactId>commons-logging-api</artifactId>
+ <version>1.1</version>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>2.4</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>jsp-api</artifactId>
+ <version>2.0</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <version>4.0</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>org.easymock</groupId>
+ <artifactId>easymock</artifactId>
+ <version>2.2</version>
+ <scope>test</scope>
+ </dependency>
+
+ <dependency>
+ <groupId>strutstestcase</groupId>
+ <artifactId>strutstestcase</artifactId>
+ <version>2.1.2-1.1-2.3</version>
+ <scope>test</scope>
+ </dependency>
+
+ </dependencies>
+
+</project>
Propchange: tiles/framework/trunk/tiles-jsp/pom.xml
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-jsp/pom.xml
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Copied: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddAttributeTag.java (from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/AddAttributeTag.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddAttributeTag.java?view=diff&rev=513762&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/AddAttributeTag.java&r1=513714&p2=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddAttributeTag.java&r2=513762
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/AddAttributeTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AddAttributeTag.java Fri Mar 2 05:50:16 2007
@@ -22,8 +22,8 @@
package org.apache.tiles.taglib;
+import org.apache.tiles.ComponentConstants;
import org.apache.tiles.taglib.ContainerTagSupport;
-import org.apache.tiles.taglib.ComponentConstants;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Copied: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java (from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java?view=diff&rev=513762&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java&r1=513714&p2=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java&r2=513762
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/AttributeTagSupport.java Fri Mar 2 05:50:16 2007
@@ -22,6 +22,7 @@
package org.apache.tiles.taglib;
import org.apache.tiles.ComponentAttribute;
+import org.apache.tiles.ComponentConstants;
import org.apache.tiles.ComponentContext;
import org.apache.tiles.TilesContainer;
import org.apache.tiles.access.TilesAccess;
Copied: tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java (from r513714, tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java)
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java?view=diff&rev=513762&p1=tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java&r1=513714&p2=tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java&r2=513762
==============================================================================
--- tiles/framework/trunk/tiles-core/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java (original)
+++ tiles/framework/trunk/tiles-jsp/src/main/java/org/apache/tiles/taglib/PutAttributeTag.java Fri Mar 2 05:50:16 2007
@@ -22,8 +22,8 @@
package org.apache.tiles.taglib;
+import org.apache.tiles.ComponentConstants;
import org.apache.tiles.taglib.ContainerTagSupport;
-import org.apache.tiles.taglib.ComponentConstants;
import org.apache.tiles.taglib.PutAttributeTagParent;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
Added: tiles/framework/trunk/tiles-jsp/src/main/resources/LICENSE.txt
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/resources/LICENSE.txt?view=auto&rev=513762
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/resources/LICENSE.txt (added)
+++ tiles/framework/trunk/tiles-jsp/src/main/resources/LICENSE.txt Fri Mar 2 05:50:16 2007
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
Propchange: tiles/framework/trunk/tiles-jsp/src/main/resources/LICENSE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-jsp/src/main/resources/LICENSE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Added: tiles/framework/trunk/tiles-jsp/src/main/resources/NOTICE.txt
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-jsp/src/main/resources/NOTICE.txt?view=auto&rev=513762
==============================================================================
--- tiles/framework/trunk/tiles-jsp/src/main/resources/NOTICE.txt (added)
+++ tiles/framework/trunk/tiles-jsp/src/main/resources/NOTICE.txt Fri Mar 2 05:50:16 2007
@@ -0,0 +1,6 @@
+ Apache Tiles
+ Copyright 1999-2007 The Apache Software Foundation
+
+ This product includes software developed at
+ The Apache Software Foundation (http://www.apache.org/).
+
Propchange: tiles/framework/trunk/tiles-jsp/src/main/resources/NOTICE.txt
------------------------------------------------------------------------------
svn:eol-style = native
Propchange: tiles/framework/trunk/tiles-jsp/src/main/resources/NOTICE.txt
------------------------------------------------------------------------------
svn:keywords = Date Author Id Revision HeadURL
Modified: tiles/framework/trunk/tiles-test/pom.xml
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/pom.xml?view=diff&rev=513762&r1=513761&r2=513762
==============================================================================
--- tiles/framework/trunk/tiles-test/pom.xml (original)
+++ tiles/framework/trunk/tiles-test/pom.xml Fri Mar 2 05:50:16 2007
@@ -14,7 +14,7 @@
<dependencies>
<dependency>
<groupId>${pom.groupId}</groupId>
- <artifactId>tiles-core</artifactId>
+ <artifactId>tiles-jsp</artifactId>
<version>${pom.version}</version>
</dependency>
<dependency>
Modified: tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java
URL: http://svn.apache.org/viewvc/tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java?view=diff&rev=513762&r1=513761&r2=513762
==============================================================================
--- tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java (original)
+++ tiles/framework/trunk/tiles-test/src/main/java/org/apache/tiles/test/servlet/SelectLocaleServlet.java Fri Mar 2 05:50:16 2007
@@ -33,7 +33,7 @@
import org.apache.tiles.TilesContainer;
import org.apache.tiles.TilesException;
import org.apache.tiles.access.TilesAccess;
-import org.apache.tiles.taglib.ComponentConstants;
+import org.apache.tiles.ComponentConstants;
/**
* @version $Rev$ $Date$