Author: apetrelli
Date: Tue Jun 29 12:29:23 2010
New Revision: 958947

URL: http://svn.apache.org/viewvc?rev=958947&view=rev
Log:
VELOCITYSB-4
Fixed site.

Added:
    velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/build.xml
      - copied unchanged from r957229, 
velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/build.xml
    velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/committers.xml
      - copied unchanged from r957229, 
velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/committers.xml
    velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/developer-guide.xml
      - copied unchanged from r957229, 
velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/developer-guide.xml
    velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/getting-started.xml
      - copied unchanged from r957229, 
velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/getting-started.xml
    velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/glossary.xml
      - copied unchanged from r957229, 
velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/glossary.xml
    velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/index.xml
      - copied unchanged from r957229, 
velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/index.xml
    velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/jar-dependencies.xml
      - copied unchanged from r957229, 
velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/jar-dependencies.xml
    velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/overview.xml
      - copied unchanged from r957229, 
velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/overview.xml
    velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/translations/
      - copied from r957229, 
velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/translations/
    velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/user-guide.xml
      - copied unchanged from r957229, 
velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/user-guide.xml
    
velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/vtl-reference-guide.xml
      - copied unchanged from r957229, 
velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/vtl-reference-guide.xml
    velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/webapps.xml
      - copied unchanged from r957229, 
velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/webapps.xml
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/etc/
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/etc/build/
    
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/etc/build/findbugs-exclude.xml
      - copied unchanged from r957229, 
velocity/sandbox/maven-reorg/engine/trunk/build/findbugs-exclude.xml
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/site/
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/site/site.xml 
  (with props)
Removed:
    velocity/sandbox/maven-reorg/engine/trunk/build/findbugs-exclude.xml
    velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/build.xml
    velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/committers.xml
    
velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/developer-guide.xml
    
velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/getting-started.xml
    velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/glossary.xml
    velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/index.xml
    
velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/jar-dependencies.xml
    velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/overview.xml
    velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/translations/
    velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/user-guide.xml
    
velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/vtl-reference-guide.xml
    velocity/sandbox/maven-reorg/engine/trunk/src/site/xdoc/docs/webapps.xml
Modified:
    velocity/sandbox/maven-reorg/engine/trunk/pom.xml
    velocity/sandbox/maven-reorg/engine/trunk/src/site/site.xml
    velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml

Modified: velocity/sandbox/maven-reorg/engine/trunk/pom.xml
URL: 
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/pom.xml?rev=958947&r1=958946&r2=958947&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/pom.xml (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/pom.xml Tue Jun 29 12:29:23 2010
@@ -76,7 +76,7 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
         <version>2.1</version>
-        <reportSets>
+<!--         <reportSets>
           <reportSet>
             <reports>
               <report>dependencies</report>
@@ -86,7 +86,7 @@
               <report>scm</report>
             </reports>
           </reportSet>
-        </reportSets>
+        </reportSets> -->
       </plugin>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
@@ -147,26 +147,14 @@
         <artifactId>maven-changelog-plugin</artifactId>
         <version>2.1</version>
       </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>findbugs-maven-plugin</artifactId>
-        <version>1.2</version>
-        <configuration>
-          <xmlOutput>true</xmlOutput>
-          <threshold>Low</threshold>
-          <effort>Max</effort>
-          <excludeFilterFile>build/findbugs-exclude.xml</excludeFilterFile>
-          <findbugsXmlOutputDirectory>xdocs</findbugsXmlOutputDirectory>
-        </configuration>
-      </plugin>
     </plugins>
   </reporting>
 
   <scm>
-    
<connection>scm:svn:http://svn.apache.org/repos/asf/velocity/engine/trunk</connection>
-    
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/engine/trunk</developerConnection>
+    
<connection>scm:svn:http://svn.apache.org/repos/asf/velocity/sandbox/maven-reorg/engine/trunk</connection>
+    
<developerConnection>scm:svn:https://svn.apache.org/repos/asf/velocity/sandbox/maven-reorg/engine/trunk</developerConnection>
     <tag>HEAD</tag>
-    <url>http://svn.apache.org/viewvc/velocity/engine/trunk</url>
+    
<url>http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk</url>
   </scm>
 
     <properties>

Modified: velocity/sandbox/maven-reorg/engine/trunk/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/src/site/site.xml?rev=958947&r1=958946&r2=958947&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/src/site/site.xml (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/src/site/site.xml Tue Jun 29 
12:29:23 2010
@@ -15,7 +15,7 @@
  "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.    
+ under the License.
 -->
 
 <project name="Apache Velocity">
@@ -32,10 +32,10 @@
   </bannerRight>
 
   <poweredBy>
-    <logo name="Apache Velocity" 
+    <logo name="Apache Velocity"
           href="http://velocity.apache.org/";
           img="/images/pbv90x30.png" />
-    <logo name="Velocity News Feed" 
+    <logo name="Velocity News Feed"
           href="http://velocity.apache.org/rss/news.rss";
           img="/images/feed-icon-24x24.jpg" />
   </poweredBy>
@@ -80,7 +80,7 @@
 
     <menu name="Developers">
         <item name="License"                  href="license.html"/>
-        <item name="Javadoc"                  href="apidocs/index.html"/>
+        <item name="Javadoc"                  
href="velocity-engine/apidocs/index.html"/>
         <item name="Changes"                  href="changes-report.html"/>
         <item name="Resolved Issues"          href="jira-report.html"/>
         <item name="Upgrading"                href="upgrading.html"/>
@@ -104,7 +104,7 @@
         <item name="Coding Standards"         
href="http://wiki.apache.org/velocity/CodeStandards"/>
         <item name="Documentation Guidelines" 
href="http://wiki.apache.org/velocity/DocumentationGuidelines"/>
         <item name="Issues"                   
href="https://issues.apache.org/jira/browse/VELOCITY"/>
-        <item name="Who we are"               
href="http://velocity.apache.org/who-we-are.html"/>
+        <item name="Who we are"               
href="http://velocity.apache.org/team-list.html"/>
     </menu>
 
     <menu name="Translations">
@@ -114,6 +114,7 @@
         <item name="User's Guide (Spanish)"   
href="translations/user-guide_es.html"/>
     </menu>
 
+    <menu ref="modules" />
     <menu ref="reports" />
 
   </body>

Modified: velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml
URL: 
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml?rev=958947&r1=958946&r2=958947&view=diff
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml (original)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/pom.xml Tue Jun 
29 12:29:23 2010
@@ -123,10 +123,26 @@
             <scope>test</scope>
         </dependency>
         <dependency>
-               <groupId>org.apache.commons</groupId>
-               <artifactId>commons-io</artifactId>
-               <version>1.3.2</version>
-               <scope>test</scope>
+            <groupId>org.apache.commons</groupId>
+            <artifactId>commons-io</artifactId>
+            <version>1.3.2</version>
+            <scope>test</scope>
         </dependency>
     </dependencies>
+    <reporting>
+        <plugins>
+            <plugin>
+                <groupId>org.codehaus.mojo</groupId>
+                <artifactId>findbugs-maven-plugin</artifactId>
+                <version>2.3.1</version>
+                <configuration>
+                    <xmlOutput>true</xmlOutput>
+                    <threshold>Low</threshold>
+                    <effort>Max</effort>
+                    
<excludeFilterFile>src/etc/build/findbugs-exclude.xml</excludeFilterFile>
+                    
<findbugsXmlOutputDirectory>xdocs</findbugsXmlOutputDirectory>
+                </configuration>
+            </plugin>
+        </plugins>
+    </reporting>
 </project>
\ No newline at end of file

Added: 
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/site/site.xml
URL: 
http://svn.apache.org/viewvc/velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/site/site.xml?rev=958947&view=auto
==============================================================================
--- velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/site/site.xml 
(added)
+++ velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/site/site.xml 
Tue Jun 29 12:29:23 2010
@@ -0,0 +1,121 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+ 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 name="Apache Velocity">
+  <publishDate position="bottom" format="yyyy-MM-dd HH:mm:ss"/>
+  <bannerLeft>
+    <name>Apache Velocity Project</name>
+    <src>/images/velocity_project_wide.png</src>
+    <href>http://velocity.apache.org/</href>
+  </bannerLeft>
+
+  <bannerRight>
+    <name>Apache Velocity</name>
+    <src>/images/velocity-logo.png</src>
+  </bannerRight>
+
+  <poweredBy>
+    <logo name="Apache Velocity"
+          href="http://velocity.apache.org/";
+          img="/images/pbv90x30.png" />
+    <logo name="Velocity News Feed"
+          href="http://velocity.apache.org/rss/news.rss";
+          img="/images/feed-icon-24x24.jpg" />
+  </poweredBy>
+
+  <skin>
+    <groupId>org.apache.velocity.site</groupId>
+    <artifactId>velocity-site-skin</artifactId>
+    <version>1.2.3</version>
+  </skin>
+
+  <body>
+    <breadcrumbs>
+      <item name="Apache" href="http://www.apache.org/"/>
+      <item name="Velocity" href="http://velocity.apache.org/"/>
+      <item name="Velocity Engine"/>
+    </breadcrumbs>
+
+    <links>
+      <item name="Engine" href="http://velocity.apache.org/engine/devel/"/>
+      <item name="Tools" href="http://velocity.apache.org/tools/devel/"/>
+      <item name="Anakia" href="http://velocity.apache.org/anakia/devel/"/>
+      <item name="Texen" href="http://velocity.apache.org/texen/devel/"/>
+      <item name="DocBook" href="http://velocity.apache.org/docbook/"/>
+      <item name="DVSL" href="http://velocity.apache.org/dvsl/devel/"/>
+    </links>
+
+    <menu name="Velocity">
+        <item name="General"                  href="../index.html"/>
+        <item name="Overview"                 href="../overview.html"/>
+        <item name="Getting Started"          href="../getting-started.html"/>
+        <item name="Web Applications"         href="../webapps.html"/>
+        <item name="Download"                 
href="http://velocity.apache.org/download.cgi"; />
+        <item name="FAQ (Wiki)"               
href="http://wiki.apache.org/velocity/VelocityFAQ"/>
+    </menu>
+
+    <menu name="Docs">
+        <item name="User Guide"               href="../user-guide.html"/>
+        <item name="Developer Guide"          href="../developer-guide.html"/>
+        <item name="VTL Reference"            
href="../vtl-reference-guide.html"/>
+        <item name="Glossary"                 href="../glossary.html"/>
+    </menu>
+
+    <menu name="Developers">
+        <item name="License"                  href="../license.html"/>
+        <item name="Javadoc"                  
href="../velocity-engine/apidocs/index.html"/>
+        <item name="Changes"                  href="../changes-report.html"/>
+        <item name="Resolved Issues"          href="../jira-report.html"/>
+        <item name="Upgrading"                href="../upgrading.html"/>
+        <item name="Dependencies"             href="../jar-dependencies.html"/>
+        <item name="Source Code Repository"   
href="http://svn.apache.org/viewvc/velocity/engine/trunk/"/>
+        <item name="Building from Source"     href="../build.html"/>
+    </menu>
+
+    <menu name="Community">
+        <item name="Wiki"                     
href="http://wiki.apache.org/velocity/"/>
+        <item name="Recent News"              
href="http://velocity.apache.org/news.html"/>
+        <item name="Powered By Velocity"      
href="http://wiki.apache.org/velocity/PoweredByVelocity"/>
+        <item name="IDE/Editor Plugins"       
href="http://wiki.apache.org/velocity/VelocityEditors"/>
+        <item name="Articles and Books"       
href="http://wiki.apache.org/velocity/PublishedArticlesAndBooks"/>
+        <item name="Get Involved"             
href="http://wiki.apache.org/velocity/GetInvolved"/>
+        <item name="Mailing Lists"            
href="http://velocity.apache.org/contact.html"/>
+    </menu>
+
+    <menu name="Velocity Development">
+        <item name="Road Map"                 
href="http://wiki.apache.org/velocity/RoadMap"/>
+        <item name="Coding Standards"         
href="http://wiki.apache.org/velocity/CodeStandards"/>
+        <item name="Documentation Guidelines" 
href="http://wiki.apache.org/velocity/DocumentationGuidelines"/>
+        <item name="Issues"                   
href="https://issues.apache.org/jira/browse/VELOCITY"/>
+        <item name="Who we are"               
href="http://velocity.apache.org/team-list.html"/>
+    </menu>
+
+    <menu name="Translations">
+        <item name="Site (Japanese)"          
href="http://www.jajakarta.org/velocity/"/>
+        <item name="User's Guide (Finnish)"   
href="../translations/user-guide_fi.html"/>
+        <item name="User's Guide (French)"    
href="../translations/user-guide_fr.html"/>
+        <item name="User's Guide (Spanish)"   
href="../translations/user-guide_es.html"/>
+    </menu>
+
+    <menu ref="modules" />
+    <menu ref="reports" />
+
+  </body>
+</project>

Propchange: 
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/site/site.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: 
velocity/sandbox/maven-reorg/engine/trunk/velocity-engine/src/site/site.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL


Reply via email to