You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@wicket.apache.org by jb...@apache.org on 2007/04/26 17:01:35 UTC
svn commit: r532768 - in /incubator/wicket/trunk/jdk-1.4:
wicket-extensions/src/main/java/org/apache/wicket/extensions/util/resource/
wicket/src/main/java/org/apache/wicket/util/template/
Author: jbq
Date: Thu Apr 26 08:01:34 2007
New Revision: 532768
URL: http://svn.apache.org/viewvc?view=rev&rev=532768
Log:
WICKET-508 Move TextTemplate to core
Added:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/
- copied from r532736, incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/resource/
Removed:
incubator/wicket/trunk/jdk-1.4/wicket-extensions/src/main/java/org/apache/wicket/extensions/util/resource/
Modified:
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/CssTemplate.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/JavaScriptTemplate.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplate.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateDecorator.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateHeaderContributor.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateLink.java
incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/CssTemplate.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/CssTemplate.java?view=diff&rev=532768&r1=532736&r2=532768
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/CssTemplate.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/CssTemplate.java Thu Apr 26 08:01:34 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.extensions.util.resource;
+package org.apache.wicket.util.template;
import java.util.Map;
@@ -42,7 +42,7 @@
}
/**
- * @see org.apache.wicket.extensions.util.resource.TextTemplateDecorator#getBeforeTemplateContents()
+ * @see org.apache.wicket.util.template.TextTemplateDecorator#getBeforeTemplateContents()
*/
public String getBeforeTemplateContents()
{
@@ -50,7 +50,7 @@
}
/**
- * @see org.apache.wicket.extensions.util.resource.TextTemplateDecorator#getAfterTemplateContents()
+ * @see org.apache.wicket.util.template.TextTemplateDecorator#getAfterTemplateContents()
*/
public String getAfterTemplateContents()
{
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/JavaScriptTemplate.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/JavaScriptTemplate.java?view=diff&rev=532768&r1=532736&r2=532768
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/JavaScriptTemplate.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/JavaScriptTemplate.java Thu Apr 26 08:01:34 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.extensions.util.resource;
+package org.apache.wicket.util.template;
import java.util.Map;
@@ -42,7 +42,7 @@
}
/**
- * @see org.apache.wicket.extensions.util.resource.TextTemplateDecorator#getBeforeTemplateContents()
+ * @see org.apache.wicket.util.template.TextTemplateDecorator#getBeforeTemplateContents()
*/
public String getBeforeTemplateContents()
{
@@ -50,7 +50,7 @@
}
/**
- * @see org.apache.wicket.extensions.util.resource.TextTemplateDecorator#getAfterTemplateContents()
+ * @see org.apache.wicket.util.template.TextTemplateDecorator#getAfterTemplateContents()
*/
public String getAfterTemplateContents()
{
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java?view=diff&rev=532768&r1=532736&r2=532768
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/PackagedTextTemplate.java Thu Apr 26 08:01:34 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.extensions.util.resource;
+package org.apache.wicket.util.template;
import java.io.IOException;
import java.util.Map;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplate.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplate.java?view=diff&rev=532768&r1=532736&r2=532768
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplate.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplate.java Thu Apr 26 08:01:34 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.extensions.util.resource;
+package org.apache.wicket.util.template;
import java.util.Map;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateDecorator.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateDecorator.java?view=diff&rev=532768&r1=532736&r2=532768
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateDecorator.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateDecorator.java Thu Apr 26 08:01:34 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.extensions.util.resource;
+package org.apache.wicket.util.template;
import java.io.IOException;
import java.io.InputStream;
@@ -58,7 +58,7 @@
/**
* @return the contents decorated with {@link #getBeforeTemplateContents()}
* and {@link #getAfterTemplateContents()}.
- * @see org.apache.wicket.extensions.util.resource.TextTemplate#asString()
+ * @see org.apache.wicket.util.template.TextTemplate#asString()
*/
public String asString()
{
@@ -72,7 +72,7 @@
/**
* @return the contents decorated with {@link #getBeforeTemplateContents()}
* and {@link #getAfterTemplateContents()}.
- * @see org.apache.wicket.extensions.util.resource.TextTemplate#asString(java.util.Map)
+ * @see org.apache.wicket.util.template.TextTemplate#asString(java.util.Map)
*/
public String asString(Map variables)
{
@@ -194,7 +194,7 @@
}
/**
- * @see org.apache.wicket.extensions.util.resource.TextTemplate#getString()
+ * @see org.apache.wicket.util.template.TextTemplate#getString()
*/
public String getString()
{
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateHeaderContributor.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateHeaderContributor.java?view=diff&rev=532768&r1=532736&r2=532768
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateHeaderContributor.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateHeaderContributor.java Thu Apr 26 08:01:34 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.extensions.util.resource;
+package org.apache.wicket.util.template;
import java.util.Map;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateLink.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateLink.java?view=diff&rev=532768&r1=532736&r2=532768
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateLink.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateLink.java Thu Apr 26 08:01:34 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.extensions.util.resource;
+package org.apache.wicket.util.template;
import java.util.Map;
Modified: incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java
URL: http://svn.apache.org/viewvc/incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java?view=diff&rev=532768&r1=532736&r2=532768
==============================================================================
--- incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java (original)
+++ incubator/wicket/trunk/jdk-1.4/wicket/src/main/java/org/apache/wicket/util/template/TextTemplateSharedResourceFactory.java Thu Apr 26 08:01:34 2007
@@ -14,7 +14,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-package org.apache.wicket.extensions.util.resource;
+package org.apache.wicket.util.template;
import java.util.Iterator;
import java.util.Map;