incubator-odf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From devin...@apache.org
Subject svn commit: r1185039 [1/2] - in /incubator/odf/trunk: ./ generator/ generator/schema2template-maven-plugin/ generator/schema2template/ generator/schema2template/src/main/javadoc/ generator/schema2template/src/main/resources/examples/odf/odf-reference/ ...
Date Mon, 17 Oct 2011 08:26:38 GMT
Author: devinhan
Date: Mon Oct 17 08:26:36 2011
New Revision: 1185039

URL: http://svn.apache.org/viewvc?rev=1185039&view=rev
Log:
#ODFTOOLKIT-290# Consolidate build of ODFToolkit sub-projects.[Developer:Yegor Kozlov,Devin;Reviewer:Devin]

Added:
    incubator/odf/trunk/pom.xml
Modified:
    incubator/odf/trunk/generator/pom.xml
    incubator/odf/trunk/generator/schema2template-maven-plugin/pom.xml
    incubator/odf/trunk/generator/schema2template/pom.xml
    incubator/odf/trunk/generator/schema2template/src/main/javadoc/overview.html
    incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odf-reference/odf-reference-template.vm
    incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odf-reference/output-files.vm
    incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/copyright.txt
    incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-attribute-template.vm
    incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-attribute-visitor.vm
    incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-element-template.vm
    incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-element-visitor.vm
    incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-elementbase-template.vm
    incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-stylefamily.vm
    incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-styleproperties.vm
    incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-styleset.vm
    incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/output-files.vm
    incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-python/output-files.vm
    incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-python/pythontest.vm
    incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-python/test_main.py
    incubator/odf/trunk/odfdom/pom.xml
    incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/copyright.txt
    incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-attribute-template.vm
    incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-element-template.vm
    incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-element-visitor.vm
    incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-elementbase-template.vm
    incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-stylefamily.vm
    incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-styleproperties.vm
    incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-styleset.vm
    incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/output-files.vm
    incubator/odf/trunk/odfdom/src/main/javadoc/overview.html
    incubator/odf/trunk/simple/pom.xml
    incubator/odf/trunk/taglets/pom.xml
    incubator/odf/trunk/validator/pom.xml
    incubator/odf/trunk/validator/src/main/webapp/META-INF/context.xml
    incubator/odf/trunk/validator/src/main/webapp/WEB-INF/web.xml
    incubator/odf/trunk/validator/src/test/resources/testInvalidPkg1.odt
    incubator/odf/trunk/validator/src/test/resources/testInvalidPkg2.odt
    incubator/odf/trunk/validator/src/test/resources/testInvalidPkg3.odt
    incubator/odf/trunk/xslt-runner-task/ant.properties
    incubator/odf/trunk/xslt-runner-task/pom.xml
    incubator/odf/trunk/xslt-runner/pom.xml
    incubator/odf/trunk/xslt-runner/sample_xslt/dummy.dtd
    incubator/odf/trunk/xslt-runner/schema.properties
    incubator/odf/trunk/xslt-runner/schema.user.properties

Modified: incubator/odf/trunk/generator/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/pom.xml?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/generator/pom.xml (original)
+++ incubator/odf/trunk/generator/pom.xml Mon Oct 17 08:26:36 2011
@@ -2,16 +2,17 @@
 <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.odftoolkit</groupId>
+    <artifactId>odf-toolkit</artifactId>
+    <version>0.5-SNAPSHOT</version>
+  </parent>
+
 	<!-- The Basics -->
-	<groupId>org.odftoolkit</groupId>
 	<artifactId>schema2template-pom</artifactId>
 	<version>0.8.8-SNAPSHOT</version>
 	<packaging>pom</packaging>
-	<parent>
-		<groupId>org.sonatype.oss</groupId>
-		<artifactId>oss-parent</artifactId>
-		<version>5</version>
-	</parent>
+
 	<properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
@@ -62,7 +63,7 @@
 					<minmemory>512m</minmemory>
 					<maxmemory>1024m</maxmemory>
 					<splitindex>true</splitindex>
-					<windowtitle>Schema2template v${project.version} - http://odftoolkit</windowtitle>
+					<windowtitle>Schema2template v${project.version} - http://incubator.apache.org/odftoolkit/</windowtitle>
 					<links>
 						<link>http://download.oracle.com/javase/6/docs/api/</link>
 					</links>
@@ -78,6 +79,10 @@
 					</execution>
 				</executions>
 			</plugin>
+			<plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+            </plugin>
 		</plugins>
 	</build>
 
@@ -89,7 +94,7 @@
     
 	<!-- More Project Information -->
 	<name>XML Schema to Template Mapping Tool: Parent POM</name>
-	<url>http://odftoolkit.org</url>
+	<url>http://incubator.apache.org/odftoolkit/odfdom/index.html</url>
 	<inceptionYear>2010</inceptionYear>
 	<licenses>
 		<license>
@@ -98,26 +103,21 @@
 		</license>
 	</licenses>
 	<organization>
-		<name>ODF Toolkit Project</name>
-		<url>http://odftoolkit.org/</url>
-	</organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+    </organization>
 	<developers>
 		<developer>
 			<id>svanteschubert</id>
 			<name>Svante</name>
-			<email>svanteschubert AT odftoolkit.org</email>
-			<url>http://odftoolkit.org/people/7-Svante-Schubert</url>
-			<organization>Sun Microsystems Inc.</organization>
-			<organizationUrl>http://www.sun.com/</organizationUrl>
+			<email>svanteschubert AT apache.org</email>
+			<organization>Individual</organization>
 			<roles>
 				<role>ODFDOM working group chair</role>
 				<role>architect</role>
 				<role>developer</role>
 			</roles>
 			<timezone>+1</timezone>
-			<properties>
-				<picUrl>http://asset-1.odftoolkit.org/attachments/images/person/SvanteSchubert-2_small.jpg</picUrl>
-			</properties>
 		</developer>
 		<developer>
 			<id>hans-peter</id>
@@ -132,40 +132,51 @@
 			</roles>
 			<timezone>+1</timezone>
 		</developer>
+		<developer>
+            <id>devinhan</id>
+            <name>Han Biao</name>
+            <email>devinhan AT apache.org</email>
+            <organization>IBM</organization>
+            <organizationUrl>http://www.ibm.com/</organizationUrl>
+            <roles>
+                <role>developer</role>
+            </roles>
+            <timezone>+8</timezone>
+        </developer>
 	</developers>
 
-  <!-- Environment Settings -->
-	<issueManagement>
-		<system>Bugzilla</system>
-		<url>https://odftoolkit.org/bugzilla/enter_bug.cgi?product=odfdom</url>
-	</issueManagement>
+	<!-- Environment Settings -->
+    <issueManagement>
+        <system>JIRA</system>
+        <url>https://issues.apache.org/jira/browse/ODFTOOLKIT</url>
+    </issueManagement>
 	<mailingLists>
-    <!-- To subscribe one of the mailing lists:
-         1) First become a member of the http://odftoolkit.org project
-         2) Second subscribe here: http://odftoolkit.org/projects/odfdom/lists -->
-		<mailingList>
-			<name>Dev List</name>
-			<archive>http://odftoolkit.org/projects/odfdom/lists/dev/archive</archive>
-		</mailingList>
 		<mailingList>
-			<name>Users List</name>
-			<archive>http://odftoolkit.org/projects/odfdom/lists/users/archive</archive>
+			<name>User List</name>
+			<post>odf-users@incubator.apache.org</post>
+			<subscribe>odf-users-subscribe@incubator.apache.org</subscribe>
+			<unsubscribe>odf-users-unsubscribe@incubator.apache.org</unsubscribe>
+			<archive>http://mail-archives.apache.org/mod_mbox/incubator-odf-users/</archive>
 		</mailingList>
 		<mailingList>
-			<name>Issues List</name>
-			<archive>http://odftoolkit.org/projects/odfdom/lists/issues/archive</archive>
+			<name>Developer List</name>
+			<post>odf-dev@incubator.apache.org</post>
+			<subscribe>odf-dev-subscribe@incubator.apache.org</subscribe>
+			<unsubscribe>odf-dev-unsubscribe@incubator.apache.org</unsubscribe>
+			<archive>http://mail-archives.apache.org/mod_mbox/incubator-odf-dev/</archive>
 		</mailingList>
 		<mailingList>
-			<name>Commits List</name>
-			<archive>http://odftoolkit.org/projects/odfdom/lists/commits/archive</archive>
+			<name>Commits</name>
+			<subscribe>odf-commits-subscribe@incubator.apache.org</subscribe>
+			<unsubscribe>odf-commmits-unsubscribe@incubator.apache.org</unsubscribe>
+			<archive>http://mail-archives.apache.org/mod_mbox/incubator-odf-commits/</archive>
 		</mailingList>
 	</mailingLists>
-
-	<scm>
-		<connection>scm:hg:https://hg.odftoolkit.org/hg/odfdom~schema2template</connection>
-		<developerConnection>scm:hg:https://hg.odftoolkit.org/hg/odfdom~schema2template</developerConnection>
-		<url>http://odftoolkit.org/projects/odfdom/sources/schema2template/show</url>
-	</scm>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/odf/trunk/generator</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/odf/trunk/generator</developerConnection>
+        <url>http://svn.apache.org/viewvc/incubator/odf/trunk/generator</url>
+    </scm>
 
 	<profiles>
     <!-- Profile for deploying to the Sonatype repository, which
@@ -201,13 +212,13 @@
 					</plugin>
 				</plugins>
 			</build>
-			<distributionManagement>
+			<!-- <distributionManagement>
 				<site>
 					<id>odfdom</id>
 					<name>ODFDOM Java Toolkit Project</name>
 					<url>dav:https://odftoolkit.org/website/odfdom/${project.version}/codegeneration/schema2template-pom</url>
 				</site>
-			</distributionManagement>			
+			</distributionManagement> -->		
 		</profile>
 	</profiles>
 </project>

Modified: incubator/odf/trunk/generator/schema2template-maven-plugin/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template-maven-plugin/pom.xml?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template-maven-plugin/pom.xml (original)
+++ incubator/odf/trunk/generator/schema2template-maven-plugin/pom.xml Mon Oct 17 08:26:36 2011
@@ -1,15 +1,39 @@
 <?xml version="1.0"?>
+
+<!--
+  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 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.odftoolkit</groupId>
+    <artifactId>schema2template-pom</artifactId>
+    <version>0.8.8-SNAPSHOT</version>
+  </parent>
+  
 	<!-- The Basics -->
-	<groupId>org.odftoolkit</groupId>
 	<artifactId>schema2template-maven-plugin</artifactId>
 	<version>0.8.8-SNAPSHOT</version>
 	<packaging>maven-plugin</packaging>
 	<dependencies>
 		<dependency>
-			<groupId>org.odftoolkit</groupId>
+			<groupId>${project.groupId}</groupId>
 			<artifactId>schema2template</artifactId>
 			<version>${project.version}</version>
 		</dependency>
@@ -38,13 +62,8 @@
 			<version>2.0.7</version>
 		</dependency>
 	</dependencies>
-	<parent>
-		<groupId>org.odftoolkit</groupId>
-		<artifactId>schema2template-pom</artifactId>
-		<version>0.8.8-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-	<properties>
+
+    <properties>
 		<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
 	</properties>
 
@@ -68,15 +87,19 @@
 			</plugin>
 		</plugins>
 	</build>
-	<distributionManagement>
+	<!-- <distributionManagement>
 		<site>
 			<id>odfdom</id>
 			<name>ODFDOM Java Toolkit Project</name>
 			<url>dav:https://odftoolkit.org/website/odfdom/${project.version}/codegeneration/schema2template-maven-plugin</url>
 		</site>
-	</distributionManagement>	
+	</distributionManagement> -->
 
 	<!-- More Project Information -->
-	<name>Schema2template Maven2 Plugin</name>
-	<url>http://odftoolkit.org</url>
+	<name>XML Schema to Template Mapping Tool: Maven2 Plugin</name>
+	<url>http://incubator.apache.org/odftoolkit/</url>
+	<organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+    </organization>
 </project>

Modified: incubator/odf/trunk/generator/schema2template/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template/pom.xml?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template/pom.xml (original)
+++ incubator/odf/trunk/generator/schema2template/pom.xml Mon Oct 17 08:26:36 2011
@@ -1,9 +1,33 @@
 <?xml version="1.0"?>
+
+<!--
+  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 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.odftoolkit</groupId>
+    <artifactId>schema2template-pom</artifactId>
+    <version>0.8.8-SNAPSHOT</version>
+  </parent>
+  
 	<!-- The Basics -->
-	<groupId>org.odftoolkit</groupId>
 	<artifactId>schema2template</artifactId>
 	<version>0.8.8-SNAPSHOT</version>
 	<packaging>jar</packaging>
@@ -25,13 +49,7 @@
 			<scope>test</scope>
 		</dependency>
 	</dependencies>
-	<parent>
-		<groupId>org.odftoolkit</groupId>
-		<artifactId>schema2template-pom</artifactId>
-		<version>0.8.8-SNAPSHOT</version>
-		<relativePath>../pom.xml</relativePath>
-	</parent>
-
+	
 	<!-- Build Settings -->
 	<build>
 		<extensions>
@@ -60,7 +78,7 @@
 								<manifestEntries>
 									<Application-Name>schema2template</Application-Name>
 									<Application-Version>${project.version}</Application-Version>
-									<Application-Website>http://odftoolkit.org</Application-Website>
+									<Application-Website>http://incubator.apache.org/odftoolkit/</Application-Website>
 									<Built-By>${user.name}</Built-By>
 									<Built-Date>${build.timestamp}</Built-Date>
 								</manifestEntries>
@@ -93,15 +111,25 @@
 					<showDeprecation>true</showDeprecation>
 				</configuration>
 			</plugin>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>src/main/resources/examples/odf/*.rng</exclude>
+                        <exclude>src/test/resources/examples/odf/*.ref</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
 		</plugins>
 	</build>
-	<distributionManagement>
+	<!-- <distributionManagement>
 		<site>
 			<id>odfdom</id>
 			<name>ODFDOM Java Toolkit Project</name>
 			<url>dav:https://odftoolkit.org/website/odfdom/${project.version}/codegeneration/schema2template</url>
 		</site>
-	</distributionManagement>
+	</distributionManagement> -->
 	<reporting>
 		<plugins>
 			<plugin>
@@ -115,7 +143,7 @@
 						<link>http://download.oracle.com/javase/6/docs/api/</link>
 					</links>
 					<splitindex>true</splitindex>
-					<windowtitle>Schema2template v${project.version} - http://odftoolkit</windowtitle>
+					<windowtitle>Schema2template v${project.version} - http://incubator.apache.org/odftoolkit/</windowtitle>
 				</configuration>
 			</plugin>
 
@@ -136,7 +164,11 @@
 	</reporting>
 
 	<!-- More Project Information -->
-	<name>schema2template</name>
+	<name>XML Schema to Template Mapping Tool: Library</name>
 	<description>XML Schema to Template Mapping Tool: Library</description>
+	<organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+    </organization>
 </project>
 

Modified: incubator/odf/trunk/generator/schema2template/src/main/javadoc/overview.html
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template/src/main/javadoc/overview.html?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template/src/main/javadoc/overview.html (original)
+++ incubator/odf/trunk/generator/schema2template/src/main/javadoc/overview.html Mon Oct 17 08:26:36 2011
@@ -1,5 +1,29 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
 <!--
+ /************************************************************************
+ *
+  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER
+
+  Copyright 2009, 2010 Oracle and/or its affiliates. All rights reserved.
+
+  Use is subject to license terms.
+
+  Licensed 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. You can also
+  obtain a copy of the License at http://odftoolkit.org/docs/license.txt
+
+  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.
+
+ ************************************************************************/
+
+-->
+<!--
 Reference this overview.html
 by specifying it in an ant task, like:
 <javadoc

Modified: incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odf-reference/odf-reference-template.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odf-reference/odf-reference-template.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odf-reference/odf-reference-template.vm (original)
+++ incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odf-reference/odf-reference-template.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,24 @@
+##################################################################
+## 
+## 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.
+##
+##################################################################
+
 ## Template to create the Java class representing an ODF element.
 ##
 ## Documentation of template development can be found in local file

Modified: incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odf-reference/output-files.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odf-reference/output-files.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odf-reference/output-files.vm (original)
+++ incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odf-reference/output-files.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,24 @@
+##################################################################
+## 
+## 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.
+##
+##################################################################
+
 <?xml version="1.0" encoding="UTF-8"?>
 ## Template to create the list of artefacts which are to be generated
 ##

Modified: incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/copyright.txt
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/copyright.txt?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/copyright.txt (original)
+++ incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/copyright.txt Mon Oct 17 08:26:36 2011
@@ -1,3 +1,23 @@
+##################################################################
+## 
+## 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.
+##
+##################################################################
 /************************************************************************
  *
  * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER

Modified: incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-attribute-template.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-attribute-template.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-attribute-template.vm (original)
+++ incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-attribute-template.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,24 @@
+##################################################################
+## 
+## 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.
+##
+##################################################################
+
 ## Template to create the list of artefacts which are to be generated
 ##
 ## Documentation of template development can be found in local file

Modified: incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-attribute-visitor.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-attribute-visitor.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-attribute-visitor.vm (original)
+++ incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-attribute-visitor.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,24 @@
+##################################################################
+## 
+## 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.
+##
+##################################################################
+
 package org.odftoolkit.odfdom.dom;
 
 import org.odftoolkit.odfdom.dom.attribute.text.TextCAttribute;

Modified: incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-element-template.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-element-template.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-element-template.vm (original)
+++ incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-element-template.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,24 @@
+##################################################################
+## 
+## 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.
+##
+##################################################################
+
 ## Template to create the Java class representing an ODF element
 ##
 ## Documentation of template development can be found in local file

Modified: incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-element-visitor.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-element-visitor.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-element-visitor.vm (original)
+++ incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-element-visitor.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,24 @@
+##################################################################
+## 
+## 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.
+##
+##################################################################
+
 package org.odftoolkit.odfdom.dom;
 
 import org.odftoolkit.odfdom.pkg.ElementVisitor;

Modified: incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-elementbase-template.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-elementbase-template.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-elementbase-template.vm (original)
+++ incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-elementbase-template.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,24 @@
+##################################################################
+## 
+## 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.
+##
+##################################################################
+
 ## Template to create the Java class representing an ODF element.
 ##
 ## Documentation of template development can be found in local file

Modified: incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-stylefamily.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-stylefamily.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-stylefamily.vm (original)
+++ incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-stylefamily.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,24 @@
+##################################################################
+## 
+## 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.
+##
+##################################################################
+
 ## Template to create the list of artefacts which are to be generated
 ##
 ## Documentation of template development can be found in local file

Modified: incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-styleproperties.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-styleproperties.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-styleproperties.vm (original)
+++ incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-styleproperties.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,24 @@
+##################################################################
+## 
+## 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.
+##
+##################################################################
+
 #include('copyright.txt')
 // !!! GENERATED SOURCE CODE !!!
 package org.odftoolkit.odfdom.dom.style.props;

Modified: incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-styleset.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-styleset.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-styleset.vm (original)
+++ incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/java-odfdom-styleset.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,24 @@
+##################################################################
+## 
+## 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.
+##
+##################################################################
+
 ## Template	to create the list of artefacts	which are to be	generated
 ##
 ## Documentation of	template development can be	found in local file

Modified: incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/output-files.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/output-files.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/output-files.vm (original)
+++ incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-java/output-files.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,24 @@
+##################################################################
+## 
+## 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.
+##
+##################################################################
+
 <?xml version="1.0" encoding="UTF-8"?>
 ## Template to create the list of artefacts which are to be generated
 ##

Modified: incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-python/output-files.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-python/output-files.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-python/output-files.vm (original)
+++ incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-python/output-files.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,24 @@
+##################################################################
+## 
+## 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.
+##
+##################################################################
+
 <?xml version="1.0" encoding="UTF-8"?>
 ## Template to create the list of artefacts which are to be generated
 ##

Modified: incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-python/pythontest.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-python/pythontest.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-python/pythontest.vm (original)
+++ incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-python/pythontest.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,24 @@
+##################################################################
+## 
+## 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.
+##
+##################################################################
+
 ## Context:
 ##
 ## - All SortedSets are copies, so in-place ops like remove, add, etc. are allowed

Modified: incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-python/test_main.py
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-python/test_main.py?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-python/test_main.py (original)
+++ incubator/odf/trunk/generator/schema2template/src/main/resources/examples/odf/odfdom-python/test_main.py Mon Oct 17 08:26:36 2011
@@ -1,3 +1,25 @@
+########################################################################
+#
+# DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER
+#
+# Copyright 2009, 2010 Oracle and/or its affiliates. All rights reserved.
+#
+# Use is subject to license terms.
+#
+# Licensed 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. You can also
+# obtain a copy of the License at http://odftoolkit.org/docs/license.txt
+#
+# 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.
+#
+########################################################################/
+
 import sys
 import os.path
 from odfdocument import OdfDocument

Modified: incubator/odf/trunk/odfdom/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/pom.xml?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/pom.xml (original)
+++ incubator/odf/trunk/odfdom/pom.xml Mon Oct 17 08:26:36 2011
@@ -2,17 +2,22 @@
 <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>
 
-	<!-- The Basics -->
-	<groupId>org.odftoolkit</groupId>
+	<parent>
+    <groupId>org.apache.odftoolkit</groupId>
+    <artifactId>odf-toolkit</artifactId>
+    <version>0.5-SNAPSHOT</version>
+	</parent>
+  
 	<artifactId>odfdom-java</artifactId>
 	<version>0.8.8-SNAPSHOT</version>
 	<packaging>jar</packaging>
-	<parent>
-		<groupId>org.sonatype.oss</groupId>
-		<artifactId>oss-parent</artifactId>
-		<version>5</version>
-	</parent>
+
 	<dependencies>
+        <dependency>
+          <groupId>${project.groupId}</groupId>
+          <artifactId>taglets</artifactId>
+          <version>${project.version}</version>
+        </dependency>
 		<dependency>
 			<groupId>xerces</groupId>
 			<artifactId>xercesImpl</artifactId>
@@ -71,7 +76,7 @@
 								<manifestEntries>
 									<ODFDOM-Name>odfdom</ODFDOM-Name>
 									<ODFDOM-Version>${project.version}</ODFDOM-Version>
-									<ODFDOM-Website>http://odftoolkit.org</ODFDOM-Website>
+									<ODFDOM-Website>http://incubator.apache.org/odftoolkit/odfdom/index.html</ODFDOM-Website>
 									<ODFDOM-Built-Date>${build.timestamp}</ODFDOM-Built-Date>
 									<ODFDOM-Supported-Odf-Version>1.2</ODFDOM-Supported-Odf-Version>
 								</manifestEntries>
@@ -107,14 +112,14 @@
 				<version>2.7</version>
 				<configuration>
 					<doctitle>ODFDOM</doctitle>
-					<minmemory>1024m</minmemory>
-					<maxmemory>2048m</maxmemory>
+					<minmemory>512m</minmemory>
+					<maxmemory>1024m</maxmemory>
 					<links>
 						<link>http://download.oracle.com/javase/6/docs/api/</link>
 						<link>http://xerces.apache.org/xerces-j/apiDocs/</link>
 					</links>
 					<splitindex>true</splitindex>
-					<windowtitle>ODFDOM API v${project.version} - http://odftoolkit</windowtitle>
+					<windowtitle>ODFDOM API v${project.version} - http://incubator.apache.org/odftoolkit/</windowtitle>
 					<taglets>
 						<taglet>
 							<tagletClass>org.odftoolkit.odfdom.taglet.OdfElementTaglet</tagletClass>
@@ -127,9 +132,9 @@
 						</taglet>
 					</taglets>
 					<tagletArtifact>
-						<groupId>org.odftoolkit</groupId>
+						<groupId>${project.groupId}</groupId>
 						<artifactId>taglets</artifactId>
-						<version>0.8.7</version>
+						<version>${project.version}</version>
 					</tagletArtifact>
 				</configuration>
 				<executions>
@@ -173,6 +178,15 @@
             <plugin>
                 <groupId>org.apache.rat</groupId>
                 <artifactId>apache-rat-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>src/main/resources/**</exclude>
+                        <exclude>src/test/resources/**</exclude>
+						<exclude>src/main/javadoc/doc-files/OpenDocument-v1.2-cd05-part1.html</exclude>
+                        <exclude>src/codegen/resources/dom/*.rng</exclude>
+                        <exclude>src/codegen/resources/pkg/*.rng</exclude>
+                    </excludes>
+                </configuration>
             </plugin>
 		</plugins>
 	</build>
@@ -184,14 +198,14 @@
 				<version>2.7</version>
 				<configuration>
 					<doctitle>ODFDOM</doctitle>
-					<minmemory>1024m</minmemory>
-					<maxmemory>2048m</maxmemory>
+                    <minmemory>512m</minmemory>
+                    <maxmemory>1024m</maxmemory>
 					<links>
 						<link>http://download.oracle.com/javase/6/docs/api/</link>
 						<link>http://xerces.apache.org/xerces-j/apiDocs/</link>
 					</links>
 					<splitindex>true</splitindex>
-					<windowtitle>ODFDOM API v${project.version} - http://odftoolkit</windowtitle>
+					<windowtitle>ODFDOM API v${project.version} - http://incubator.apache.org/odftoolkit/</windowtitle>
 					<taglets>
 						<taglet>
 							<tagletClass>org.odftoolkit.odfdom.taglet.OdfElementTaglet</tagletClass>
@@ -204,9 +218,9 @@
 						</taglet>
 					</taglets>
 					<tagletArtifact>
-						<groupId>org.odftoolkit</groupId>
+						<groupId>${project.groupId}</groupId>
 						<artifactId>taglets</artifactId>
-						<version>0.8.7</version>
+						<version>${project.version}</version>
 					</tagletArtifact>
 				</configuration>
 			</plugin>
@@ -247,7 +261,8 @@
 
 	<!-- More Project Information -->
 	<name>ODFDOM</name>
-	<description>ODFDOM is an OpenDocument Format (ODF) framework. Its purpose
+	<description>
+		ODFDOM is an OpenDocument Format (ODF) framework. Its purpose
 		is to provide an easy common way to create, access and
 		manipulate ODF files, without requiring detailed knowledge of
 		the ODF specification. It is designed to provide the ODF
@@ -256,8 +271,9 @@
 
 		The current reference implementation is written in Java.
 	</description>
-	<url>http://odftoolkit.org/projects/odfdom/pages/Home</url>
+	<url>http://incubator.apache.org/odftoolkit/odfdom/index.html</url>
 	<inceptionYear>2008</inceptionYear>
+	
 	<licenses>
 		<license>
 			<name>Apache 2</name>
@@ -265,17 +281,16 @@
 		</license>
 	</licenses>
 	<organization>
-		<name>ODF Toolkit Project</name>
-		<url>http://odftoolkit.org/</url>
-	</organization>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
+    </organization>
 	<developers>
 		<developer>
 			<id>svanteschubert</id>
 			<name>Svante</name>
-			<email>svanteschubert AT odftoolkit.org</email>
+			<email>svanteschubert AT apache.org</email>
 			<url>http://odftoolkit.org/people/7-Svante-Schubert</url>
-			<organization>Oracle Inc.</organization>
-			<organizationUrl>http://www.oracle.com/</organizationUrl>
+			<organization>Individual</organization>
 			<roles>
 				<role>ODFDOM working group chair</role>
 				<role>architect</role>
@@ -287,10 +302,9 @@
 			</properties>
 		</developer>
 		<developer>
-			<id>Devin</id>
+			<id>devinhan</id>
 			<name>Han Biao</name>
-			<email>devin AT odftoolkit.org</email>
-			<url>http://odftoolkit.org/people/748-Devin</url>
+			<email>devinhan AT apache.org</email>
 			<organization>IBM</organization>
 			<organizationUrl>http://www.ibm.com/</organizationUrl>
 			<roles>
@@ -299,9 +313,9 @@
 			<timezone>+8</timezone>
 		</developer>
 		<developer>
-			<id>Daisy</id>
+			<id>daisyguo</id>
 			<name>Ying Chun Guo</name>
-			<email>Daisy AT odftoolkit.org</email>
+			<email>daisyguo AT apache.org</email>
 			<url>http://odftoolkit.org/people/274-Ying-Chun-Guo</url>
 			<organization>IBM</organization>
 			<organizationUrl>http://www.ibm.com/</organizationUrl>
@@ -422,35 +436,36 @@
 
 	<!-- Environment Settings -->
 	<issueManagement>
-		<system>Bugzilla</system>
-		<url>https://odftoolkit.org/bugzilla/enter_bug.cgi?product=odfdom</url>
-	</issueManagement>
+        <system>JIRA</system>
+        <url>https://issues.apache.org/jira/browse/ODFTOOLKIT</url>
+    </issueManagement>
 	<mailingLists>
-		<!-- To subscribe one of the mailing lists:
-			1) First become a member of the http://odftoolkit.org project
-			2) Second subscribe here: http://odftoolkit.org/projects/odfdom/lists -->
 		<mailingList>
-			<name>Dev List</name>
-			<archive>http://odftoolkit.org/projects/odfdom/lists/dev/archive</archive>
+			<name>User List</name>
+			<post>odf-users@incubator.apache.org</post>
+			<subscribe>odf-users-subscribe@incubator.apache.org</subscribe>
+			<unsubscribe>odf-users-unsubscribe@incubator.apache.org</unsubscribe>
+			<archive>http://mail-archives.apache.org/mod_mbox/incubator-odf-users/</archive>
 		</mailingList>
 		<mailingList>
-			<name>Users List</name>
-			<archive>http://odftoolkit.org/projects/odfdom/lists/users/archive</archive>
+			<name>Developer List</name>
+			<post>odf-dev@incubator.apache.org</post>
+			<subscribe>odf-dev-subscribe@incubator.apache.org</subscribe>
+			<unsubscribe>odf-dev-unsubscribe@incubator.apache.org</unsubscribe>
+			<archive>http://mail-archives.apache.org/mod_mbox/incubator-odf-dev/</archive>
 		</mailingList>
 		<mailingList>
-			<name>Issues List</name>
-			<archive>http://odftoolkit.org/projects/odfdom/lists/issues/archive</archive>
-		</mailingList>
-		<mailingList>
-			<name>Commits List</name>
-			<archive>http://odftoolkit.org/projects/odfdom/lists/commits/archive</archive>
+			<name>Commits</name>
+			<subscribe>odf-commits-subscribe@incubator.apache.org</subscribe>
+			<unsubscribe>odf-commmits-unsubscribe@incubator.apache.org</unsubscribe>
+			<archive>http://mail-archives.apache.org/mod_mbox/incubator-odf-commits/</archive>
 		</mailingList>
 	</mailingLists>
-	<scm>
-		<connection>scm:hg:https://hg.odftoolkit.org/hg/odfdom~developer</connection>
-		<developerConnection>scm:hg:https://hg.odftoolkit.org/hg/odfdom~developer</developerConnection>
-		<url>http://odftoolkit.org/projects/odfdom/sources/developer/show</url>
-	</scm>
+    <scm>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/odf/trunk/odfdom</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/odf/trunk/odfdom</developerConnection>
+        <url>http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom</url>
+    </scm>
 	<!-- Upload of JAVA DOC for SNAPSHOOTs
 	<distributionManagement>
 		<site>
@@ -465,9 +480,9 @@
 			<build>
 				<plugins>
 					<plugin>
-						<groupId>org.odftoolkit</groupId>
+						<groupId>${project.groupId}</groupId>
 						<artifactId>schema2template-maven-plugin</artifactId>
-						<version>0.8.7</version>
+						<version>${project.version}</version>
 						<executions>
 							<execution>
 								<id>dom</id>
@@ -521,7 +536,7 @@
 				</plugins>
 			</build>
 		</profile>
--->
+		-->
 		<profile>
 			<id>integration-test</id>
 			<activation>
@@ -572,7 +587,7 @@
 				</plugins>
 			</build>
 		</profile>
-    <!-- Profile for deploying to the Sonatype repository, which
+		<!-- Profile for deploying to the Sonatype repository, which
          requires GPG signatures 
 		 see
 		 https://docs.sonatype.org/display/Repository/Sonatype+OSS+Maven+Repository+Usage+Guide
@@ -605,13 +620,13 @@
                     </plugin>
                 </plugins>
             </build>
-			<distributionManagement>
+			<!-- <distributionManagement>
 				<site>
 					<id>odfdom</id>
 					<name>ODFDOM Java Toolkit Project</name>
 					<url>dav:https://odftoolkit.org/website/odfdom/${project.version}/odfdom</url>
 				</site>
-			</distributionManagement>
+			</distributionManagement> -->
 		</profile>
 	</profiles>
 </project>

Modified: incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/copyright.txt
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/copyright.txt?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/copyright.txt (original)
+++ incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/copyright.txt Mon Oct 17 08:26:36 2011
@@ -1,3 +1,5 @@
+##################################################################
+## 
 ## 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
@@ -5,15 +7,17 @@
 ## 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.
+##
+##################################################################
 
 
 /************************************************************************

Modified: incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-attribute-template.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-attribute-template.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-attribute-template.vm (original)
+++ incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-attribute-template.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,5 @@
+##################################################################
+## 
 ## 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
@@ -5,16 +7,17 @@
 ## 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.
-
+##
+################################################################## 
 
 ## Template to create the list of artefacts which are to be generated
 ##

Modified: incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-element-template.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-element-template.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-element-template.vm (original)
+++ incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-element-template.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,5 @@
+##################################################################
+## 
 ## 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
@@ -5,15 +7,17 @@
 ## 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.
+##
+##################################################################
 
 
 

Modified: incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-element-visitor.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-element-visitor.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-element-visitor.vm (original)
+++ incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-element-visitor.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,5 @@
+##################################################################
+## 
 ## 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
@@ -5,15 +7,17 @@
 ## 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.
+##
+##################################################################
 
 
 

Modified: incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-elementbase-template.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-elementbase-template.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-elementbase-template.vm (original)
+++ incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-elementbase-template.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,5 @@
+##################################################################
+## 
 ## 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
@@ -5,15 +7,17 @@
 ## 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.
+##
+##################################################################
 
 
 ## Template to create the Java class representing an ODF element.

Modified: incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-stylefamily.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-stylefamily.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-stylefamily.vm (original)
+++ incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-stylefamily.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,5 @@
+##################################################################
+## 
 ## 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
@@ -5,15 +7,17 @@
 ## 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.
+##
+##################################################################
 
 
 ## Template to create the list of artefacts which are to be generated

Modified: incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-styleproperties.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-styleproperties.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-styleproperties.vm (original)
+++ incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-styleproperties.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,5 @@
+##################################################################
+## 
 ## 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
@@ -5,15 +7,17 @@
 ## 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.
+##
+##################################################################
 
 
 #include('copyright.txt')

Modified: incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-styleset.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-styleset.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-styleset.vm (original)
+++ incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/java-odfdom-styleset.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,5 @@
+##################################################################
+## 
 ## 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
@@ -5,15 +7,17 @@
 ## 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.
+##
+##################################################################
 
 
 ## Template	to create the list of artefacts	which are to be	generated

Modified: incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/output-files.vm
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/output-files.vm?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/output-files.vm (original)
+++ incubator/odf/trunk/odfdom/src/codegen/resources/dom/template/output-files.vm Mon Oct 17 08:26:36 2011
@@ -1,3 +1,5 @@
+##################################################################
+## 
 ## 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
@@ -5,15 +7,17 @@
 ## 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.
+##
+##################################################################
 
 
 <?xml version="1.0" encoding="UTF-8"?>

Modified: incubator/odf/trunk/odfdom/src/main/javadoc/overview.html
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/odfdom/src/main/javadoc/overview.html?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/odfdom/src/main/javadoc/overview.html (original)
+++ incubator/odf/trunk/odfdom/src/main/javadoc/overview.html Mon Oct 17 08:26:36 2011
@@ -1,4 +1,28 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 3.2 Final//EN">
+<!--
+ /************************************************************************
+ *
+  DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER
+
+  Copyright 2008, 2010 Oracle and/or its affiliates. All rights reserved.
+
+  Use is subject to license terms.
+
+  Licensed 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. You can also
+  obtain a copy of the License at http://odftoolkit.org/docs/license.txt
+
+  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.
+
+ ************************************************************************/
+
+-->
 <html>
     <body>
 

Added: incubator/odf/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/pom.xml?rev=1185039&view=auto
==============================================================================
--- incubator/odf/trunk/pom.xml (added)
+++ incubator/odf/trunk/pom.xml Mon Oct 17 08:26:36 2011
@@ -0,0 +1,124 @@
+<?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 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>
+  <packaging>pom</packaging>
+  <parent>
+    <groupId>org.apache</groupId>
+    <artifactId>apache</artifactId>
+    <version>10</version>
+  </parent>
+
+  <groupId>org.apache.odftoolkit</groupId>
+  <artifactId>odf-toolkit</artifactId>
+  <version>0.5-SNAPSHOT</version>
+  
+  <name>Apache ODF Toolkit</name>
+  <url>http://incubator.apache.org/odftoolkit/</url>
+  <organization>
+    <name>The Apache Software Foundation</name>
+    <url>http://www.apache.org/</url>
+  </organization>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/odf/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/odf/trunk</developerConnection>
+    <url>http://svn.apache.org/viewvc/incubator/odf/trunk</url>
+  </scm>
+  <issueManagement>
+	<system>jira</system>
+	<url>https://issues.apache.org/jira/browse/ODFTOOLKIT</url>
+  </issueManagement>
+  <mailingLists>
+	<mailingList>
+		<name>User List</name>
+		<post>odf-users@incubator.apache.org</post>
+		<subscribe>odf-users-subscribe@incubator.apache.org</subscribe>
+		<unsubscribe>odf-users-unsubscribe@incubator.apache.org</unsubscribe>
+		<archive>http://mail-archives.apache.org/mod_mbox/incubator-odf-users/</archive>
+	</mailingList>
+	<mailingList>
+		<name>Developer List</name>
+		<post>odf-dev@incubator.apache.org</post>
+		<subscribe>odf-dev-subscribe@incubator.apache.org</subscribe>
+		<unsubscribe>odf-dev-unsubscribe@incubator.apache.org</unsubscribe>
+		<archive>http://mail-archives.apache.org/mod_mbox/incubator-odf-dev/</archive>
+	</mailingList>
+	<mailingList>
+		<name>Commits</name>
+		<subscribe>odf-commits-subscribe@incubator.apache.org</subscribe>
+		<unsubscribe>odf-commmits-unsubscribe@incubator.apache.org</unsubscribe>
+		<archive>http://mail-archives.apache.org/mod_mbox/incubator-odf-commits/</archive>
+	</mailingList>
+  </mailingLists>
+ 
+
+  <modules>
+    <module>taglets</module>
+    <module>generator</module>
+    <module>xslt-runner</module>
+    <module>xslt-runner-task</module>
+    <module>odfdom</module>
+    <module>validator</module>
+    <module>simple</module>
+  </modules>
+  
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.rat</groupId>
+                <artifactId>apache-rat-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>.gitignore</exclude>
+                        <exclude>.git/**</exclude>
+                        <exclude>.idea/**</exclude>
+                    </excludes>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <profiles>
+        <profile>
+            <id>pedantic</id>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.apache.rat</groupId>
+                        <artifactId>apache-rat-plugin</artifactId>
+                        <executions>
+                            <execution>
+                                <phase>verify</phase>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
+    </profiles>  
+</project>
+

Modified: incubator/odf/trunk/simple/pom.xml
URL: http://svn.apache.org/viewvc/incubator/odf/trunk/simple/pom.xml?rev=1185039&r1=1185038&r2=1185039&view=diff
==============================================================================
--- incubator/odf/trunk/simple/pom.xml (original)
+++ incubator/odf/trunk/simple/pom.xml Mon Oct 17 08:26:36 2011
@@ -1,21 +1,21 @@
 <?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>
-    <!-- The Basics -->
-    <groupId>org.odftoolkit</groupId>
-    <artifactId>simple-odf</artifactId>
-    <version>0.7-SNAPSHOT</version>
-    <packaging>jar</packaging>
     <parent>
-        <groupId>org.sonatype.oss</groupId>
-        <artifactId>oss-parent</artifactId>
-        <version>6</version>
+      <groupId>org.apache.odftoolkit</groupId>
+      <artifactId>odf-toolkit</artifactId>
+      <version>0.5-SNAPSHOT</version>
     </parent>
+
+    <artifactId>simple-odf</artifactId>
+	<version>0.7-SNAPSHOT</version>
+    <packaging>jar</packaging>
+
     <dependencies>
         <dependency>
-            <groupId>org.odftoolkit</groupId>
-            <artifactId>odfdom-java</artifactId>
-            <version>0.8.7</version>
+           <groupId>${project.groupId}</groupId>
+           <artifactId>odfdom-java</artifactId>
+           <version>0.8.8-SNAPSHOT</version>
         </dependency>
         <dependency>
             <groupId>xerces</groupId>
@@ -66,9 +66,9 @@
                             <manifestSection>
                                 <name>SIMPLE-ODF</name>
                                 <manifestEntries>
-                                    <SIMPLE-ODF-Name>Simple Java API for ODF</SIMPLE-ODF-Name>
+                                    <SIMPLE-ODF-Name>Simple Java API for ODF(Simple ODF)</SIMPLE-ODF-Name>
                                     <SIMPLE-ODF-Version>${project.version}</SIMPLE-ODF-Version>
-                                    <SIMPLE-ODF-Website>http://odftoolkit.org</SIMPLE-ODF-Website>
+                                    <SIMPLE-ODF-Website>http://incubator.apache.org/odftoolkit/simple/index.html</SIMPLE-ODF-Website>
                                     <SIMPLE-ODF-Built-By>${user.name}</SIMPLE-ODF-Built-By>
                                     <SIMPLE-ODF-Built-Date>${build.timestamp}</SIMPLE-ODF-Built-Date>
                                     <SIMPLE-ODF-Supported-ODF-Version>1.2</SIMPLE-ODF-Supported-ODF-Version>
@@ -91,7 +91,7 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.7</version>
                 <configuration>
-                    <doctitle>Simple Java API for ODF</doctitle>
+                    <doctitle>Simple Java API for ODF(Simple ODF)</doctitle>
                     <minmemory>512m</minmemory>
                     <maxmemory>1024m</maxmemory>
                     <links>
@@ -100,7 +100,7 @@
                         <link>http://odfdom.odftoolkit.org/0.8.7/odfdom/apidocs/</link>
                     </links>
                     <splitindex>true</splitindex>
-                    <windowtitle>Simple ODF API v${project.version} - http://odftoolkit</windowtitle>
+                    <windowtitle>Simple ODF v${project.version} - http://odftoolkit</windowtitle>
                 </configuration>
                 <executions>
                     <execution>
@@ -177,6 +177,11 @@
             <plugin>
                 <groupId>org.apache.rat</groupId>
                 <artifactId>apache-rat-plugin</artifactId>
+                <configuration>
+                    <excludes>
+                        <exclude>src/test/resources/**</exclude>
+                    </excludes>
+                </configuration>
             </plugin>
         </plugins>
         <extensions>
@@ -199,7 +204,7 @@
                 <artifactId>maven-javadoc-plugin</artifactId>
                 <version>2.7</version>
                 <configuration>
-                    <doctitle>Simple Java API for ODF</doctitle>
+                    <doctitle>Simple Java API for ODF(Simple ODF)</doctitle>
                     <minmemory>512m</minmemory>
                     <maxmemory>1024m</maxmemory>
                     <links>
@@ -208,7 +213,7 @@
                         <link>http://odfdom.odftoolkit.org/0.8.7/odfdom/apidocs/</link>
                     </links>
                     <splitindex>true</splitindex>
-                    <windowtitle>Simple ODF API v${project.version} - http://odftoolkit</windowtitle>
+                    <windowtitle>Simple ODF API v${project.version} - http://incubator.apache.org/odftoolkit/</windowtitle>
                 </configuration>
             </plugin>
             <!-- Code Coverage Testing generated by Cobertura -->
@@ -244,9 +249,9 @@
         </plugins>
     </reporting>
     <!-- More Project Information -->
-    <name>Simple Java API for ODF project</name>
-    <description>Simple Java API for ODF project</description>
-    <url>http://odftoolkit.org/projects/simple/pages/Home</url>
+    <name>Simple Java API for ODF (Simple ODF)</name>
+    <description>A simple API for manipulate ODF documents easily.</description>
+    <url>http://incubator.apache.org/odftoolkit/simple/index.html</url>
     <inceptionYear>2010</inceptionYear>
     <licenses>
         <license>
@@ -256,30 +261,25 @@
         </license>
     </licenses>
     <organization>
-        <name>ODF Toolkit Project</name>
-        <url>http://odftoolkit.org/</url>
+        <name>The Apache Software Foundation</name>
+        <url>http://www.apache.org/</url>
     </organization>
     <developers>
         <developer>
-            <id>Daisy</id>
+            <id>daisyguo</id>
             <name>Ying Chun Guo</name>
-            <email>Daisy AT odftoolkit.org</email>
-            <url>http://odftoolkit.org/people/274-Ying-Chun-Guo</url>
+            <email>daisyguo AT apache.org</email>
             <organization>IBM</organization>
             <organizationUrl>http://www.ibm.com/</organizationUrl>
             <roles>
                 <role>developer</role>
             </roles>
             <timezone>+8</timezone>
-            <properties>
-                <picUrl>http://asset-2.odftoolkit.org/attachments/images/person/Daisy.jpg</picUrl>
-            </properties>
         </developer>
         <developer>
-            <id>devin</id>
+            <id>devinhan</id>
             <name>Han Biao</name>
-            <email>devin AT odftoolkit.org</email>
-            <url>http://odftoolkit.org/people/748-Devin</url>
+            <email>devinhan AT apache.org</email>
             <organization>IBM</organization>
             <organizationUrl>http://www.ibm.com/</organizationUrl>
             <roles>
@@ -288,38 +288,38 @@
             <timezone>+8</timezone>
         </developer>
     </developers>
+	
     <!-- Environment Settings -->
     <issueManagement>
-        <system>Bugzilla</system>
-        <url>https://odftoolkit.org/bugzilla/enter_bug.cgi?product=simple</url>
+        <system>JIRA</system>
+        <url>https://issues.apache.org/jira/browse/ODFTOOLKIT</url>
     </issueManagement>
-    <mailingLists>
-        <!--
-            To subscribe one of the mailing lists: 1) First become a member of
-            the http://odftoolkit.org project 2) Second subscribe here:
-            http://odftoolkit.org/projects/simple/lists
-        -->
-        <mailingList>
-            <name>Dev List</name>
-            <archive>http://odftoolkit.org/projects/simple/lists/dev/archive</archive>
-        </mailingList>
-        <mailingList>
-            <name>Users List</name>
-            <archive>http://odftoolkit.org/projects/simple/lists/users/archive</archive>
-        </mailingList>
-        <mailingList>
-            <name>Issues List</name>
-            <archive>http://odftoolkit.org/projects/simple/lists/issues/archive</archive>
-        </mailingList>
-        <mailingList>
-            <name>Commits List</name>
-            <archive>http://odftoolkit.org/projects/simple/lists/commits/archive</archive>
-        </mailingList>
-    </mailingLists>
+	<mailingLists>
+		<mailingList>
+			<name>User List</name>
+			<post>odf-users@incubator.apache.org</post>
+			<subscribe>odf-users-subscribe@incubator.apache.org</subscribe>
+			<unsubscribe>odf-users-unsubscribe@incubator.apache.org</unsubscribe>
+			<archive>http://mail-archives.apache.org/mod_mbox/incubator-odf-users/</archive>
+		</mailingList>
+		<mailingList>
+			<name>Developer List</name>
+			<post>odf-dev@incubator.apache.org</post>
+			<subscribe>odf-dev-subscribe@incubator.apache.org</subscribe>
+			<unsubscribe>odf-dev-unsubscribe@incubator.apache.org</unsubscribe>
+			<archive>http://mail-archives.apache.org/mod_mbox/incubator-odf-dev/</archive>
+		</mailingList>
+		<mailingList>
+			<name>Commits</name>
+			<subscribe>odf-commits-subscribe@incubator.apache.org</subscribe>
+			<unsubscribe>odf-commmits-unsubscribe@incubator.apache.org</unsubscribe>
+			<archive>http://mail-archives.apache.org/mod_mbox/incubator-odf-commits/</archive>
+		</mailingList>
+	</mailingLists>
     <scm>
-        <connection>scm:hg:https://hg.odftoolkit.org/hg/simple~code-base</connection>
-        <developerConnection>scm:hg:https://hg.odftoolkit.org/hg/simple~code-base</developerConnection>
-        <url>http://odftoolkit.org/projects/simple/sources/code-base/show</url>
+        <connection>scm:svn:http://svn.apache.org/repos/asf/incubator/odf/trunk/simple</connection>
+        <developerConnection>scm:svn:https://svn.apache.org/repos/asf/incubator/odf/trunk/simple</developerConnection>
+        <url>http://svn.apache.org/viewvc/incubator/odf/trunk/simple</url>
     </scm>
     <profiles>
         <profile>
@@ -475,13 +475,13 @@
             <properties>
                 <project.reporting.outputDirectory>target/site/apidocs</project.reporting.outputDirectory>
             </properties>
-            <distributionManagement>
+            <!-- <distributionManagement>
                 <site>
                     <id>simple-odf-website</id>
-                    <name>Simple Java API for ODF Project</name>
+                    <name>Simple Java API for ODF(Simple ODF)</name>
                     <url>dav:https://odftoolkit.org/website/simple/${project.version}/simple</url>
                 </site>
-            </distributionManagement>
+            </distributionManagement> -->
         </profile>
     </profiles>
 </project>



Mime
View raw message