Author: mrdon
Date: Tue Sep 26 23:36:30 2006
New Revision: 450346
URL: http://svn.apache.org/viewvc?view=rev&rev=450346
Log:
Moved the config-browser into its own plugin, fixed a minor bug in a template
WW-1457
Added:
struts/struts2/trunk/plugins/config-browser/
struts/struts2/trunk/plugins/config-browser/pom.xml
struts/struts2/trunk/plugins/config-browser/src/
struts/struts2/trunk/plugins/config-browser/src/main/
struts/struts2/trunk/plugins/config-browser/src/main/java/
struts/struts2/trunk/plugins/config-browser/src/main/java/org/
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/
struts/struts2/trunk/plugins/config-browser/src/main/java/org/apache/struts2/config_browser/
- copied from r450303,
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/
struts/struts2/trunk/plugins/config-browser/src/main/resources/
struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/
- copied from r450303,
struts/struts2/trunk/core/src/main/resources/config-browser/
struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml
- copied, changed from r450303,
struts/struts2/trunk/core/src/main/resources/config-browser.xml
Removed:
struts/struts2/trunk/core/src/main/java/org/apache/struts2/config_browser/
struts/struts2/trunk/core/src/main/resources/config-browser/
struts/struts2/trunk/core/src/main/resources/config-browser.xml
Modified:
struts/struts2/trunk/apps/showcase/pom.xml
struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml
struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/page-header.ftl
Modified: struts/struts2/trunk/apps/showcase/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/pom.xml?view=diff&rev=450346&r1=450345&r2=450346
==============================================================================
--- struts/struts2/trunk/apps/showcase/pom.xml (original)
+++ struts/struts2/trunk/apps/showcase/pom.xml Tue Sep 26 23:36:30 2006
@@ -36,6 +36,12 @@
<version>${pom.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-config-browser-plugin</artifactId>
+ <version>${pom.version}</version>
+ </dependency>
+
<dependency>
<groupId>javax.servlet</groupId>
Modified: struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml?view=diff&rev=450346&r1=450345&r2=450346
==============================================================================
--- struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml (original)
+++ struts/struts2/trunk/apps/showcase/src/main/resources/struts.xml Tue Sep 26
23:36:30 2006
@@ -10,8 +10,6 @@
<include file="struts-default.xml"/>
- <include file="config-browser.xml"/>
-
<include file="struts-chat.xml" />
<include file="struts-hangman.xml" />
Added: struts/struts2/trunk/plugins/config-browser/pom.xml
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/pom.xml?view=auto&rev=450346
==============================================================================
--- struts/struts2/trunk/plugins/config-browser/pom.xml (added)
+++ struts/struts2/trunk/plugins/config-browser/pom.xml Tue Sep 26 23:36:30 2006
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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";>
+ <modelVersion>4.0.0</modelVersion>
+ <parent>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-plugins</artifactId>
+ <version>2.0.1-SNAPSHOT</version>
+ </parent>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts2-config-browser-plugin</artifactId>
+ <packaging>jar</packaging>
+ <name>Struts 2 Configuration Browser Plugin</name>
+
+ <distributionManagement>
+ <site>
+ <id>apache-site</id>
+
<url>scp://people.apache.org/www/struts.apache.org/2.x/plugins/config-browser</url>
+ </site>
+ </distributionManagement>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.struts</groupId>
+ <artifactId>struts-core</artifactId>
+ <version>1.3.5</version>
+ </dependency>
+ </dependencies>
+</project>
Modified:
struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/page-header.ftl
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/page-header.ftl?view=diff&rev=450346&r1=450303&r2=450346
==============================================================================
---
struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/page-header.ftl
(original)
+++
struts/struts2/trunk/plugins/config-browser/src/main/resources/config-browser/page-header.ftl
Tue Sep 26 23:36:30 2006
@@ -1,5 +1,5 @@
<!DOCTYPE html PUBLIC "-//Tigris//DTD XHTML 1.0 Transitional//EN"
- "${req.contextPath}/template-tigris/css/tigris_transitional.dtd">
+ "${request.contextPath}/template-tigris/css/tigris_transitional.dtd">
<html>
<head>
<title>${pageTitle}</title>
Copied:
struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml
(from r450303, struts/struts2/trunk/core/src/main/resources/config-browser.xml)
URL:
http://svn.apache.org/viewvc/struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml?view=diff&rev=450346&p1=struts/struts2/trunk/core/src/main/resources/config-browser.xml&r1=450303&p2=struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml&r2=450346
==============================================================================
--- struts/struts2/trunk/core/src/main/resources/config-browser.xml (original)
+++
struts/struts2/trunk/plugins/config-browser/src/main/resources/struts-plugin.xml
Tue Sep 26 23:36:30 2006
@@ -5,9 +5,7 @@
"http://struts.apache.org/dtds/struts-2.0.dtd";>
<struts>
- <include file="struts-default.xml"/>
-
- <package name="config" extends="struts-default"
namespace="/config-browser">
+ <package name="config-browser" extends="struts-default"
namespace="/config-browser">
<interceptors>
<interceptor-stack name="config-browser-default">
<interceptor-ref name="validationWorkflowStack"/>
