struts-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From mr...@apache.org
Subject svn commit: r491622 - in /struts/struts2/trunk: core/pom.xml core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java pom.xml
Date Mon, 01 Jan 2007 20:22:55 GMT
Author: mrdon
Date: Mon Jan  1 12:22:54 2007
New Revision: 491622

URL: http://svn.apache.org/viewvc?view=rev&rev=491622
Log:
Integrating xwork docs with struts docs
WW-1395

Modified:
    struts/struts2/trunk/core/pom.xml
    struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java
    struts/struts2/trunk/pom.xml

Modified: struts/struts2/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/pom.xml?view=diff&rev=491622&r1=491621&r2=491622
==============================================================================
--- struts/struts2/trunk/core/pom.xml (original)
+++ struts/struts2/trunk/core/pom.xml Mon Jan  1 12:22:54 2007
@@ -20,23 +20,31 @@
 
     <build>
         <plugins>
-            <plugin>
-                <artifactId>maven-javadoc-plugin</artifactId>
-                <version>2.0</version>
-                <configuration>
-                    <sourcepath>src/main/java;../../xwork/src/java</sourcepath>
-                    <groups>
-                        <group>
-                            <title>Struts Packages</title>
-                            <packages>org.apache.struts2*</packages>
-                        </group>
-                        <group>
-                            <title>XWork Packages</title>
-                            <packages>com.opensymphony.xwork2*</packages>
-                        </group>
-                    </groups>
-                </configuration>
+        	<plugin>
+                <artifactId>maven-dependency-plugin</artifactId>
+                <version>2.0-alpha-1-SNAPSHOT</version>
+                <executions>
+                    <execution>
+                        <id>unpack-xwork</id>
+                        <phase>generate-sources</phase>
+                        <goals>
+                            <goal>unpack</goal>
+                        </goals>
+                        <configuration>
+		                    <artifactItems>
+		                        <artifactItem>
+		                            <groupId>opensymphony</groupId>
+		                            <artifactId>xwork</artifactId>
+		                            <version>2.0-SNAPSHOT</version>
+		                            <classifier>sources</classifier>
+		                        </artifactItem>
+		                    </artifactItems>
+		                    <outputDirectory>${project.build.directory}/xwork-sources</outputDirectory>
+		                </configuration>
+                    </execution>
+				</executions>
             </plugin>
+            
 <!--
             <plugin>
                 <groupId>org.apache.myfaces.tobago</groupId>
@@ -67,6 +75,36 @@
 -->
         </plugins>
     </build>
+    
+    <reporting>
+        <plugins>
+        	<plugin>
+                <artifactId>maven-javadoc-plugin</artifactId>
+                <version>2.2</version>
+                <configuration>
+                    <sourcepath>${basedir}/src/main/java;${basedir}/target/xwork-sources</sourcepath>
+                    <encoding>UTF-8</encoding>
+                    <groups>
+                        <group>
+                            <title>Struts Packages</title>
+                            <packages>org.apache.struts2*</packages>
+                        </group>
+                        <group>
+                            <title>XWork Packages</title>
+                            <packages>com.opensymphony.xwork2*</packages>
+                        </group>
+                    </groups>
+                    <show>private</show>
+                    <links>
+                        <link>http://java.sun.com/j2se/1.5.0/docs/api</link>
+                        <link>http://java.sun.com/javaee/5/docs/api/</link>
+                        <link>http://jakarta.apache.org/commons/logging/apidocs/</link>
+                        <link>http://logging.apache.org/log4j/docs/api/</link>
+                    </links>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
     
     <profiles>
      	<profile>

Modified: struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java?view=diff&rev=491622&r1=491621&r2=491622
==============================================================================
--- struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java
(original)
+++ struts/struts2/trunk/core/src/main/java/org/apache/struts2/views/xslt/AdapterFactory.java
Mon Jan  1 12:22:54 2007
@@ -90,9 +90,6 @@
  */
 public class AdapterFactory {
 
-    /**
-     * Map<Class, Class<AdapterNode>>
-     */
     private Map<Class, Class> adapterTypes = new HashMap<Class, Class>();
 
     /**

Modified: struts/struts2/trunk/pom.xml
URL: http://svn.apache.org/viewvc/struts/struts2/trunk/pom.xml?view=diff&rev=491622&r1=491621&r2=491622
==============================================================================
--- struts/struts2/trunk/pom.xml (original)
+++ struts/struts2/trunk/pom.xml Mon Jan  1 12:22:54 2007
@@ -307,6 +307,14 @@
           <enabled>false</enabled>
         </releases>
       </pluginRepository>
+      <pluginRepository>
+            <id>apache.snapshots</id>
+            <name>Apache Maven Repository (Snapshots and Test Builds)</name>
+            <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+            <releases><enabled>false</enabled></releases>
+            <snapshots><enabled>true</enabled></snapshots>
+        </pluginRepository>
+ 
     </pluginRepositories>
 
 </project>



Mime
View raw message