You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by sk...@apache.org on 2008/05/26 22:45:02 UTC

svn commit: r660299 - in /myfaces/shared/trunk: core/pom.xml pom.xml shared-impl/pom.xml shared-orchestra/pom.xml shared-tomahawk/pom.xml src/site/apt/format.apt src/site/apt/index.apt src/site/site.xml

Author: skitching
Date: Mon May 26 13:44:59 2008
New Revision: 660299

URL: http://svn.apache.org/viewvc?rev=660299&view=rev
Log:
Cleanups to generate a decent site for shared JSF1.1 module.
Also make pom and site more consistent with shared JSF1.2 branch.

Removed:
    myfaces/shared/trunk/src/site/apt/format.apt
Modified:
    myfaces/shared/trunk/core/pom.xml
    myfaces/shared/trunk/pom.xml
    myfaces/shared/trunk/shared-impl/pom.xml
    myfaces/shared/trunk/shared-orchestra/pom.xml
    myfaces/shared/trunk/shared-tomahawk/pom.xml
    myfaces/shared/trunk/src/site/apt/index.apt
    myfaces/shared/trunk/src/site/site.xml

Modified: myfaces/shared/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/core/pom.xml?rev=660299&r1=660298&r2=660299&view=diff
==============================================================================
--- myfaces/shared/trunk/core/pom.xml (original)
+++ myfaces/shared/trunk/core/pom.xml Mon May 26 13:44:59 2008
@@ -1,21 +1,27 @@
-<?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">
+<?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">
+
   <parent>
     <artifactId>myfaces-shared-project</artifactId>
     <groupId>org.apache.myfaces.shared</groupId>
     <version>2.0.8-SNAPSHOT</version>
   </parent>
+
   <modelVersion>4.0.0</modelVersion>
   <artifactId>myfaces-shared-core</artifactId>
   <packaging>jar</packaging>
   <name>Apache MyFaces Shared For JSF 1.1 - Core </name>
-  <description>The MyFaces Shared Core Subproject builds the source artifact
-    needed by myfaces-shared-impl, myfaces-shared-tomahawk and myfaces-shared-orchestra</description>
-  <url>http://myfaces.apache.org</url>
+  <description>The MyFaces Shared Core Subproject builds the source artifact needed by the shared-* modules.</description>
+
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/shared/trunk/core</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shared/trunk/core</developerConnection>
     <url>http://svn.apache.org/viewcvs.cgi/myfaces/shared/trunk/core</url>
   </scm>
+
   <build>
     <plugins>
       <plugin>

Modified: myfaces/shared/trunk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/pom.xml?rev=660299&r1=660298&r2=660299&view=diff
==============================================================================
--- myfaces/shared/trunk/pom.xml (original)
+++ myfaces/shared/trunk/pom.xml Mon May 26 13:44:59 2008
@@ -1,23 +1,50 @@
-<?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">
+<?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">
+
   <parent>
       <groupId>org.apache.myfaces</groupId>
       <artifactId>myfaces</artifactId>
       <version>5</version>
   </parent>
+
   <modelVersion>4.0.0</modelVersion>
   <groupId>org.apache.myfaces.shared</groupId>
   <artifactId>myfaces-shared-project</artifactId>
   <packaging>pom</packaging>
   <name>Apache MyFaces Shared For JSF 1.1 - Project</name>
   <version>2.0.8-SNAPSHOT</version>
-  <description>The MyFaces Shared project provides base classes that are used in the
-    MyFaces Core Implementation, the MyFaces Tomahawk components, and MyFaces Orchestra.
-    Note: When bound to myfaces-impl, myfaces-tomahawk, or myfaces-orchestra the shared classes
-    get another namespace. That is:
-    myfaces-impl: org.apache.myfaces.shared_impl.* instead of org.apache.myfaces.shared.*
-    myfaces-tomahawk: org.apache.myfaces.shared_tomahawk.* instead of org.apache.myfaces.shared.*
-    myfaces-orchestra: org.apache.myfaces.shared_orchestra.* instead of org.apache.myfaces.shared.*</description>
-  <url>http://myfaces.apache.org</url>
+  <description>Provides common classes for use in various MyFaces projects.</description>
+  <url>http://myfaces.apache.org/shared11</url>
+
+  <scm>
+    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/shared/trunk</connection>
+    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shared/trunk</developerConnection>
+    <url>http://svn.apache.org/viewcvs.cgi/myfaces/shared/trunk</url>
+  </scm>
+
+  <modules>
+    <module>core</module>
+    <module>shared-impl</module>
+    <module>shared-tomahawk</module>
+    <module>shared-orchestra</module>
+  </modules>
+
+  <repositories>
+    <repository>
+        <releases>
+          <enabled>false</enabled>
+        </releases>
+        <snapshots>
+          <enabled>true</enabled>
+        </snapshots>
+      <id>apache-maven-snapshots</id>
+      <url>http://people.apache.org/repo/m2-snapshot-repository</url>
+    </repository>
+  </repositories>
+
   <build>
     <pluginManagement>
       <plugins>
@@ -35,102 +62,107 @@
       </plugins>
     </pluginManagement>
   </build>
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/shared/trunk</connection>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/shared/trunk</developerConnection>
-    <url>http://svn.apache.org/viewcvs.cgi/myfaces/shared/trunk</url>
-  </scm>
-  <modules>
-    <module>core</module>
-    <module>shared-impl</module>
-    <module>shared-tomahawk</module>
-    <module>shared-orchestra</module>
-  </modules>
+
   <dependencies>
     <dependency>
-      <groupId>easymock</groupId>
-      <artifactId>easymockclassextension</artifactId>
-      <version>1.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>httpunit</groupId>
-      <artifactId>httpunit</artifactId>
-      <version>1.6</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
       <groupId>org.apache.myfaces.core</groupId>
       <artifactId>myfaces-api</artifactId>
       <version>1.1.5</version>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>
       <version>2.3</version>
       <scope>provided</scope>
     </dependency>
+
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>jsp-api</artifactId>
       <version>2.0</version>
       <scope>provided</scope>
     </dependency>
+
+    <dependency>
+      <groupId>portlet-api</groupId>
+      <artifactId>portlet-api</artifactId>
+      <version>1.0</version>
+      <scope>provided</scope>
+    </dependency>
+
     <dependency>
       <groupId>commons-el</groupId>
       <artifactId>commons-el</artifactId>
       <version>1.0</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>cactus</groupId>
-      <artifactId>cactus</artifactId>
-      <version>13-1.7.1</version>
-      <scope>test</scope>
-    </dependency>
+
     <dependency>
       <groupId>commons-codec</groupId>
       <artifactId>commons-codec</artifactId>
       <version>1.3</version>
       <scope>compile</scope>
     </dependency>
-    <dependency>
-      <groupId>nekohtml</groupId>
-      <artifactId>nekohtml</artifactId>
-      <version>0.9.1</version>
-      <scope>test</scope>
-    </dependency>
-    <dependency>
-      <groupId>portlet-api</groupId>
-      <artifactId>portlet-api</artifactId>
-      <version>1.0</version>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.struts.shale</groupId>
-      <artifactId>shale-test</artifactId>
-      <version>1.0.2</version>
-      <scope>test</scope>
-    </dependency>
+
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <version>1.0.4</version>
+      <version>1.1.1</version>
       <scope>compile</scope>
     </dependency>
+
+    <!-- Test dependencies -->
+
     <dependency>
       <groupId>easymock</groupId>
       <artifactId>easymock</artifactId>
       <version>1.1</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>easymock</groupId>
+      <artifactId>easymockclassextension</artifactId>
+      <version>1.1</version>
+      <scope>test</scope>
+    </dependency>
+
     <dependency>
       <groupId>commons-httpclient</groupId>
       <artifactId>commons-httpclient</artifactId>
       <version>2.0.2</version>
       <scope>test</scope>
     </dependency>
+
+    <dependency>
+      <groupId>cactus</groupId>
+      <artifactId>cactus</artifactId>
+      <version>13-1.7.1</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>nekohtml</groupId>
+      <artifactId>nekohtml</artifactId>
+      <version>0.9.1</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.apache.struts.shale</groupId>
+      <artifactId>shale-test</artifactId>
+      <version>1.0.2</version>
+      <scope>test</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>httpunit</groupId>
+      <artifactId>httpunit</artifactId>
+      <version>1.6</version>
+      <scope>test</scope>
+    </dependency>
   </dependencies>
 
   <distributionManagement>

Modified: myfaces/shared/trunk/shared-impl/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/shared-impl/pom.xml?rev=660299&r1=660298&r2=660299&view=diff
==============================================================================
--- myfaces/shared/trunk/shared-impl/pom.xml (original)
+++ myfaces/shared/trunk/shared-impl/pom.xml Mon May 26 13:44:59 2008
@@ -1,21 +1,24 @@
-<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">
+<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">
+
   <parent>
     <artifactId>myfaces-shared-project</artifactId>
     <groupId>org.apache.myfaces.shared</groupId>
     <version>2.0.8-SNAPSHOT</version>
   </parent>
+
   <modelVersion>4.0.0</modelVersion>
   <artifactId>myfaces-shared-impl</artifactId>
   <name>Apache MyFaces Shared - Impl</name>
-  <description>The "Apache MyFaces Shared - Impl" subproject relocates all
-  shared classes to the new Java package namespace "org.apache.myfaces.shared_impl.*"
-  which is used by the "Apache MyFaces Core Impl" project.</description>
-  <url>http://myfaces.apache.org</url>
+  <description>Shared Project renamed for use in the MyFaces Impl jar.</description>
+
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/shared/trunk/shared-impl</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/shared/trunk/shared-impl</developerConnection>
     <url>http://svn.apache.org/viewcvs.cgi/myfaces/shared/trunk/shared-impl</url>
   </scm>
+
   <build>
     <resources>
       <resource>

Modified: myfaces/shared/trunk/shared-orchestra/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/shared-orchestra/pom.xml?rev=660299&r1=660298&r2=660299&view=diff
==============================================================================
--- myfaces/shared/trunk/shared-orchestra/pom.xml (original)
+++ myfaces/shared/trunk/shared-orchestra/pom.xml Mon May 26 13:44:59 2008
@@ -1,21 +1,24 @@
-<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">
+<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">
+
   <parent>
     <artifactId>myfaces-shared-project</artifactId>
     <groupId>org.apache.myfaces.shared</groupId>
     <version>2.0.8-SNAPSHOT</version>
   </parent>
+
   <modelVersion>4.0.0</modelVersion>
   <artifactId>myfaces-shared-orchestra</artifactId>
   <name>Apache MyFaces Shared - Orchestra</name>
-  <description>The "Apache MyFaces Shared - Orchestra" subproject relocates all
-  shared classes to the new Java package namespace "org.apache.myfaces.shared_orchestra.*"
-  which is used by the "Apache MyFaces Orchestra" project.</description>
-  <url>http://myfaces.apache.org</url>
+  <description>Shared Project renamed for use in Orchestra.</description>
+
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/shared/trunk/shared-orchestra</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/shared/trunk/shared-orchestra</developerConnection>
     <url>http://svn.apache.org/viewcvs.cgi/myfaces/shared/trunk/shared-orchestra</url>
   </scm>
+
   <build>
     <resources>
       <resource>

Modified: myfaces/shared/trunk/shared-tomahawk/pom.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/shared-tomahawk/pom.xml?rev=660299&r1=660298&r2=660299&view=diff
==============================================================================
--- myfaces/shared/trunk/shared-tomahawk/pom.xml (original)
+++ myfaces/shared/trunk/shared-tomahawk/pom.xml Mon May 26 13:44:59 2008
@@ -1,21 +1,24 @@
-<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">
+<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">
+
   <parent>
     <artifactId>myfaces-shared-project</artifactId>
     <groupId>org.apache.myfaces.shared</groupId>
     <version>2.0.8-SNAPSHOT</version>
   </parent>
+
   <modelVersion>4.0.0</modelVersion>
   <artifactId>myfaces-shared-tomahawk</artifactId>
   <name>Apache MyFaces Shared - Tomahawk</name>
-  <description>The "Apache MyFaces Shared - Tomahawk" subproject relocates all
-  shared classes to the new Java package namespace "org.apache.myfaces.shared_tomahawk.*"
-  which is used by the "Apache MyFaces Tomahawk" project.</description>
-  <url>http://myfaces.apache.org</url>
+  <description>Shared project renamed for use in Tomahawk.</description>
+
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/myfaces/shared/trunk/shared-tomahawk</connection>
     <developerConnection>scm:svn:https://svn.apache.org/repos/asf/myfaces/shared/trunk/shared-tomahawk</developerConnection>
     <url>http://svn.apache.org/viewcvs.cgi/myfaces/shared/trunk/shared-tomahawk</url>
   </scm>
+
   <build>
     <resources>
       <resource>

Modified: myfaces/shared/trunk/src/site/apt/index.apt
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/src/site/apt/index.apt?rev=660299&r1=660298&r2=660299&view=diff
==============================================================================
--- myfaces/shared/trunk/src/site/apt/index.apt (original)
+++ myfaces/shared/trunk/src/site/apt/index.apt Mon May 26 13:44:59 2008
@@ -1,8 +1,130 @@
  ------
-MyFaces Impl
+MyFaces Shared for JSF 1.1
  ------
 
-
 Overview
 
-  Blah blah.
\ No newline at end of file
+  The Apache MyFaces project provides a number of different "artefacts":
+
+  * MyFaces Core (JSF specification implementation)
+
+  * Tomahawk
+
+  * Trinidad
+
+  * Orchestra
+
+  * etc.
+
+  There are cases where these projects have "utility" classes in common. In particular, MyFaces Core
+  and Tomahawk have quite a lot of common code. It would not be good software engineering for each
+  project to maintain its own copy of these classes, as bugfixes and enhancements would need to be
+  applied separately to each. The "shared" code is therefore stored in the source code repository
+  as a separate "module".
+
+  When bound to myfaces-impl, myfaces-tomahawk, or myfaces-orchestra the shared classes
+  get another namespace. For example, "org.apache.myfaces.shared" becomes:
+
+  *  org.apache.myfaces.shared_impl.* when used in the myfaces-core project
+
+  *  org.apache.myfaces.shared_tomahawk.* when used in the myfaces-tomahawk project
+
+  This module can be found in svn at:
+
+    * http://svn.apache.org/repos/asf/myfaces/shared/
+
+Design and Use
+
+  In versions of MyFaces-Core/Tomahawk up to 1.1.1, the shared code was built as a a separate
+  jarfile that must be present in the classpath in order to use either MyFaces Core or Tomahawk. 
+  Unfortunately this had a number of drawbacks, the most serious being that only versions of Core
+  and Tomahawk that use the same version of the shared library could be deployed together. If a user
+  wanted to upgrade to a newer release of Tomahawk to fix a bug, then they had to upgrade to the
+  matching version of the shared lib - which then meant upgrading to the matching version of Core
+  too. It also meant that the MyFaces project effectively had to release Core and Tomahawk at the
+  same time (ie tie their release cycles together).
+
+  As more MyFaces projects are created which use the shared code, this problem only gets worse.
+
+  To resolve this, releases of MyFaces-Core and Tomahawk 1.1.2 or later pre-process the code in
+  the shared module at compile time; the package "org.apache.myfaces.shared" becomes
+  "org.apache.myfaces.shared_impl" (for Core), "org.apache.myfaces.shared_tomahawk" for Tomahawk,
+  and is similarly renamed for other projects. The resulting classes are then included directly
+  into the project's jarfile, removing the need for an extra "shared" jar. This allows
+  various projects that use the shared code to be mixed without conflicts over shared code
+  versions, and allows different release cycles for each project.
+
+  This process of modifying the package-name can be thought of as a "primitive OSGi" if you
+  like; a way of running multiple copies of this library concurrently. However rather than
+  relying on custom classloaders to implement this (as OSGi requires), a simple package hack
+  is being done.
+
+  Note that this kind of "package renaming" has been used elsewhere. In particular, the Sun
+  JDK itself repackages a number of libraries; for example org.apache.xerces can be found in
+  the standard rt.jar file as com.sun.org.apache.xerces. In release 1.4 of Java, Sun did not
+  do that, and the result was some very ugly conflicts when users tried to put a more modern
+  version of xerces in the classpath. The shared project is implemented as it is for very
+  similar reasons.
+
+What are the submodules of Shared for?
+
+  Ideally, there would be just one "shared" project, and any other project that wishes to "import"
+  the shared code would perform the necessary renaming. Unfortunately things aren't quite that
+  elegant at the moment. Instead, there is a "core" shared module that contains the real code,
+  and a sub-project for each shared library 'user' that does the renaming. This will hopefully
+  be done away with in the future. For now, you can (mostly) ignore all of the subprojects
+  except the "core" one.
+
+Why not just a normal library?
+
+  There are two primary reasons why shared is not just a jarfile that other projects put on
+  their classpath.
+
+  Firstly, in order to avoid the "jar hell" described in the above section when multiple
+  projects that use shared are all present in the classpath, a strict binary compatibility
+  rule would need to exist for the shared project. The compatibility would not only need
+  to avoid breaking any APIs, but would also need to ensure that no behaviour changed
+  between releases. That's hard to do. And any mistake could subtly break things making
+  debugging really hard.
+
+  Secondly, it would mean that the MyFaces Core releases would be three jars, not two.
+  That is inelegant, and not consistent with Sun's JSF implementation.
+
+Versioning
+
+  The shared module has its own version numbers; see the version element in the pom.xml file for
+  the shared module. Note that the shared module version numbers are independent of the version
+  number for the project that uses it (though of course a new "release" of the shared module only
+  occurs when a release of a project that depends on it is performed).
+
+  The using project (eg Core or Tomahawk) declares a dependency on a specific version of the shared
+  module. See the pom.xml file for the relevant project to see what version of the shared library it
+  uses.
+
+JSF 1.1 vs JSF 1.2
+
+  There are separate versions of the shared code for JSF 1.1 and JSF 1.2. The JSF1.2 branch can
+  use java1.5 features for example. 
+
+  However some MyFaces projects support both JSF1.1 and JSF1.2 with just one trunk version. In
+  that case, the project declares a dependency on the JSF1.1 version of the shared code.
+
+  When applying a patch to either branch of the Shared project, the patch should be evaluated to
+  see whether it is appropriate for applying to the other branch too.
+
+  The shared library versions intended for use with JSF 1.1 have version numbers of form "2.x".
+  Releases intended for use with JSF 1.2 have versions of form "3.x".
+
+Issues
+
+  The unusual approach of "package renaming" does sometimes make life a little more difficult for
+  developers. 
+
+  In older MyFaces project releases, the -sources jarfiles did not include the renamed source code
+  for the "imported" shared module. This meant that it was impossible to step through some of the
+  code in MyFaces projects. This has been fixed in later releases; the repackaged shared source is
+  found in the sources jar for projects that import the shared project.
+
+  Setting breakpoints can also be a little tricky; when debugging tomahawk for example, make sure
+  that a breakpoint set in a class from the shared project is set on the version with package
+  name "org.apache.myfaces.shared_tomahawk"!

Modified: myfaces/shared/trunk/src/site/site.xml
URL: http://svn.apache.org/viewvc/myfaces/shared/trunk/src/site/site.xml?rev=660299&r1=660298&r2=660299&view=diff
==============================================================================
--- myfaces/shared/trunk/src/site/site.xml (original)
+++ myfaces/shared/trunk/src/site/site.xml Mon May 26 13:44:59 2008
@@ -1,37 +1,66 @@
 <?xml version="1.0" encoding="ISO-8859-1"?>
-<project name="MyFaces Impl">
+<!--
+ * 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="MyFaces Shared for JSF 1.1">
   <bannerLeft>
-    <name>MyFaces Commons</name>
-    <src>images/myfaces-logo.png</src>
-    <href>http://myfaces.apache.org/</href>
+    <name>Apache MyFaces</name>
+    <src>img/banners/MyFaces_logo.jpg</src>
+    <href>http://myfaces.apache.org/index.html</href>
   </bannerLeft>
+
   <bannerRight>
-    <name>Easter Island</name>
-    <src>images/easter.png</src>
-    <href>http://myfaces.apache.org/</href>
+    <name>Apache Banner</name>
+    <src>img/banners/apache_banner.png</src>
+    <href>http://www.apache.org/</href>
   </bannerRight>  
 
-  <body>
+  <publishDate format="dd MMM yyyy"/>
+
+  <skin>
+    <groupId>org.apache.myfaces.maven</groupId>
+    <artifactId>myfaces-site-skin</artifactId>
+    <version>1-SNAPSHOT</version>
+  </skin>
 
+  <body>
     <links>
-      <item name="API" href="../api/index.html"/>
-      <item name="Impl" href="../impl/index.html"/>
-      <item name="Commons" href="index.html"/>
-      <item name="Tomahawk" href="../tomahawk/index.html"/>
-      <item name="Sandbox" href="../sandbox/index.html"/>
+      <item name="Apache" href="http://www.apache.org"/>
+      <item name="MyFaces" href="http://myfaces.apache.org/index.html"/>
     </links>
 
-    <menu name="MyFaces Projects">
-      <item name="Overview" href="../index.html"/>
-      <item name="API" href="../api/index.html"/>
-      <item name="Impl" href="../impl/index.html"/>
-      <item name="Commons" href="index.html"/>
-      <item name="Tomahawk" href="../tomahawk/index.html"/>
-      <item name="Sandbox" href="../sandbox/index.html"/>
+    <menu name="Apache MyFaces" inherit="top">
+      <item name="Overview"       href="http://myfaces.apache.org/index.html"/>
+      <item name="Download"       href="http://myfaces.apache.org/download.html"/>
     </menu>
 	
-	  ${reports}
-    
+    <menu ref="modules"/>
+
+    <menu name="Documentation">
+      <item name="About"         href="index.html"/>
+      <item name="Core Javadocs" href="myfaces-shared-core/apidocs/index.html"/>
+    </menu>
+
+    <menu ref="reports"/>
+
+    <menu name="Foundation" inherit="top">
+      <item name="ASF"            href="http://www.apache.org/" />
+      <item name="Sponsorship"    href="http://www.apache.org/foundation/sponsorship.html" />
+      <item name="Thanks"         href="http://www.apache.org/foundation/thanks.html" />
+    </menu>
   </body>
 </project>