myfaces-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From bom...@apache.org
Subject svn commit: r399369 - in /myfaces/tobago/trunk/tobago-tool: gendoc/pom.xml gendoc/src/main/webapp/WEB-INF/tobago-config.xml gendoc/src/main/webapp/WEB-INF/web.xml gendoc/src/main/webapp/screenshot/menuBar.jsp pom.xml
Date Wed, 03 May 2006 18:14:02 GMT
Author: bommel
Date: Wed May  3 11:13:58 2006
New Revision: 399369

URL: http://svn.apache.org/viewcvs?rev=399369&view=rev
Log:
fixed gendoc war

Modified:
    myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/tobago-config.xml
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/web.xml
    myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/menuBar.jsp
    myfaces/tobago/trunk/tobago-tool/pom.xml

Modified: myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml?rev=399369&r1=399368&r2=399369&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/pom.xml Wed May  3 11:13:58 2006
@@ -29,30 +29,18 @@
   <name>Tobago gendoc</name>
   <build>
     <finalName>gendoc</finalName>
-    <plugins>
+    <!--<plugins>
       <plugin>
-        <groupId>org.apache.myfaces.tobago</groupId>
-        <artifactId>maven-theme-plugin</artifactId>
-        <version>${version}</version>
-        <executions>
-          <execution>
-            <goals>
-              <goal>resources</goal>
-            </goals>
-          </execution>
-        </executions>
+        <groupId>org.codehaus.mojo</groupId>
+        <artifactId>tomcat-maven-plugin</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <configuration>
+          <server>tomcat</server>
+          <update>true</update>
+          <url>http://localhost:8080/manager</url>
+        </configuration>
       </plugin>
-      <!--<plugin>-->
-        <!--<groupId>org.codehaus.mojo</groupId>-->
-        <!--<artifactId>tomcat-maven-plugin</artifactId>-->
-        <!--<version>1.0-SNAPSHOT</version>-->
-        <!--<configuration>-->
-          <!--<server>tomcat</server>-->
-          <!--<update>true</update>-->
-          <!--<url>http://localhost:8080/manager</url>-->
-        <!--</configuration>-->
-      <!--</plugin>-->
-    </plugins>
+    </plugins>-->
   </build>
   <dependencies>
     <dependency>

Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/tobago-config.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/tobago-config.xml?rev=399369&r1=399368&r2=399369&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/tobago-config.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/tobago-config.xml Wed
May  3 11:13:58 2006
@@ -23,10 +23,9 @@
 
   <theme-config>
     <default-theme>speyside</default-theme>
-    <supported-theme>scarborough</supported-theme>
   </theme-config>
 
   <resource-dir>tobago-resource</resource-dir>
-  <resource-dir>tobago</resource-dir>
+  <resource-dir>org/apache/myfaces/tobago/renderkit</resource-dir>
 
 </tobago-config>

Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/web.xml?rev=399369&r1=399368&r2=399369&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/web.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/WEB-INF/web.xml Wed May  3 11:13:58
2006
@@ -28,6 +28,7 @@
     <filter-name>multipartFormdataFilter</filter-name>
     <filter-class>org.apache.myfaces.tobago.webapp.TobagoMultipartFormdataFilter</filter-class>
   </filter>
+
   <filter-mapping>
     <filter-name>multipartFormdataFilter</filter-name>
     <url-pattern>/faces/*</url-pattern>
@@ -39,6 +40,11 @@
     <load-on-startup>3</load-on-startup>
   </servlet>
 
+  <servlet>
+    <servlet-name>ResourceServlet</servlet-name>
+    <servlet-class>org.apache.myfaces.tobago.servlet.ResourceServlet</servlet-class>
+  </servlet>
+
   <!-- servlet-mapping -->
 
   <servlet-mapping>
@@ -46,4 +52,9 @@
     <url-pattern>/faces/*</url-pattern>
   </servlet-mapping>
 
+  <servlet-mapping>
+    <servlet-name>ResourceServlet</servlet-name>
+    <url-pattern>/org/apache/myfaces/tobago/renderkit/*</url-pattern>
+  </servlet-mapping>
+  
 </web-app>

Modified: myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/menuBar.jsp
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/menuBar.jsp?rev=399369&r1=399368&r2=399369&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/menuBar.jsp (original)
+++ myfaces/tobago/trunk/tobago-tool/gendoc/src/main/webapp/screenshot/menuBar.jsp Wed May
 3 11:13:58 2006
@@ -33,7 +33,7 @@
             <tc:menuItem label="Print"/>
             <tc:menuSeparator/>
             <tc:menuItem label="Exit"/>
-            <tc:menuCheckbox label="Administration Mode"/>
+            <%--<tc:menuCheckbox action="none" label="Administration Mode"/>--%>
           </tc:menu>
 
           <%-- code-sniplet-start id="menu" --%>

Modified: myfaces/tobago/trunk/tobago-tool/pom.xml
URL: http://svn.apache.org/viewcvs/myfaces/tobago/trunk/tobago-tool/pom.xml?rev=399369&r1=399368&r2=399369&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-tool/pom.xml (original)
+++ myfaces/tobago/trunk/tobago-tool/pom.xml Wed May  3 11:13:58 2006
@@ -14,4 +14,12 @@
     <module>maven-theme-plugin</module>
     <module>tobago-tool-apt</module>
   </modules>
+  <profiles>
+    <profile>
+      <id>all-modules</id>
+      <modules>
+        <module>gendoc</module>
+      </modules>
+    </profile>
+  </profiles>
 </project>



Mime
View raw message