commons-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nia...@apache.org
Subject svn commit: r547847 - in /jakarta/commons/proper/el/trunk: NOTICE.txt maven.xml project.properties project.xml xdocs/cvs-usage.xml xdocs/issue-tracking.xml xdocs/navigation.xml xdocs/style/project.css
Date Sat, 16 Jun 2007 02:22:52 GMT
Author: niallp
Date: Fri Jun 15 19:22:51 2007
New Revision: 547847

URL: http://svn.apache.org/viewvc?view=rev&rev=547847
Log:
Bring EL build up to date

Added:
    jakarta/commons/proper/el/trunk/xdocs/cvs-usage.xml   (with props)
    jakarta/commons/proper/el/trunk/xdocs/issue-tracking.xml   (with props)
Modified:
    jakarta/commons/proper/el/trunk/NOTICE.txt
    jakarta/commons/proper/el/trunk/maven.xml
    jakarta/commons/proper/el/trunk/project.properties
    jakarta/commons/proper/el/trunk/project.xml
    jakarta/commons/proper/el/trunk/xdocs/navigation.xml
    jakarta/commons/proper/el/trunk/xdocs/style/project.css

Modified: jakarta/commons/proper/el/trunk/NOTICE.txt
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/el/trunk/NOTICE.txt?view=diff&rev=547847&r1=547846&r2=547847
==============================================================================
--- jakarta/commons/proper/el/trunk/NOTICE.txt (original)
+++ jakarta/commons/proper/el/trunk/NOTICE.txt Fri Jun 15 19:22:51 2007
@@ -1,5 +1,5 @@
 Apache Jakarta Commons EL
-Copyright 1999-2006 The Apache Software Foundation
+Copyright 1999-2007 The Apache Software Foundation
 
 This product includes software developed by
 The Apache Software Foundation (http://www.apache.org/).

Modified: jakarta/commons/proper/el/trunk/maven.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/el/trunk/maven.xml?view=diff&rev=547847&r1=547846&r2=547847
==============================================================================
--- jakarta/commons/proper/el/trunk/maven.xml (original)
+++ jakarta/commons/proper/el/trunk/maven.xml Fri Jun 15 19:22:51 2007
@@ -15,23 +15,109 @@
    limitations under the License.
 -->
 <project default="java:jar"
+  xmlns:ant="jelly:ant"
   xmlns:j="jelly:core">
 
-  <!-- ================================================================== -->
-  <!-- START : C O M M O N S - B U I L D                                  -->
-  <!-- ================================================================== -->
-  <!-- Required: Look and Feel for documentation within distributions     -->
-  <!-- ================================================================== -->
-  <postGoal name="xdoc:copy-resources">  
-    <copy todir="${basedir}/target/docs/style/" failonerror="false">
-      <fileset dir="${basedir}/../commons-build/xdocs/style">
-      	<include name='**/*'/>
-      	<exclude name='**/CVS/**'/>
-      </fileset>
-    </copy>
-  </postGoal>
-  <!-- ================================================================== -->
-  <!-- END: C O M M O N S - B U I L D                                     -->
-  <!-- ================================================================== -->
+    <!-- ================================================================== -->
+    <!-- Copy into the binary distribution                                  -->
+    <!-- ================================================================== -->
+    <postGoal name="dist:prepare-bin-filesystem">
+
+        <!-- Create a jar file containing the sources -->
+        <jar destfile="${maven.dist.bin.assembly.dir}/${maven.final.name}-sources.jar">
+            <zipfileset prefix="META-INF" dir="${basedir}"
+                includes="LICENSE*, NOTICE*"/>
+            <fileset dir="${basedir}/src/java" includes="**/*.java"/>
+        </jar>
+
+        <!-- Create a jar file containing the Javadocs -->
+        <jar destfile="${maven.dist.bin.assembly.dir}/${maven.final.name}-javadoc.jar">
+            <zipfileset prefix="META-INF" dir="${basedir}"
+                includes="LICENSE*, NOTICE*"/>
+            <fileset dir="${basedir}/target/docs/apidocs"/>
+        </jar>
+
+        <copy todir="${maven.dist.bin.assembly.dir}">
+            <fileset file='${basedir}/NOTICE.txt'/>
+            <fileset file="${basedir}/RELEASE-NOTES.txt"/>
+        </copy>
+
+    </postGoal>
+
+    <!-- ================================================================== -->
+    <!-- Copy into the source distribution                                  -->
+    <!-- ================================================================== -->
+    <postGoal name="dist:prepare-src-filesystem">
+
+        <!-- Copy the NOTICE -->
+        <copy todir="${maven.dist.src.assembly.dir}">
+            <fileset file='${basedir}/NOTICE.txt'/>
+            <fileset file="${basedir}/RELEASE-NOTES.txt"/>
+            <fileset file="${basedir}/build.properties.sample"/>
+            <fileset file="${basedir}/PROPOSAL.html"/>
+        </copy>
+
+        <!-- Copy xdoc files -->
+        <copy todir="${maven.dist.src.assembly.dir}/xdocs">
+            <fileset dir="./xdocs"/>
+        </copy>
+
+    </postGoal>
+
+    <!-- ================================================================== -->
+    <!-- Create MD5 Check Sums                                              -->
+    <!-- ================================================================== -->
+    <postGoal name="dist">
+
+         <!-- Create a versioned pom -->
+         <copy file="${basedir}/project.xml" tofile="${maven.dist.dir}/${maven.final.name}.pom"/>
+
+         <!-- create checksum for pom -->
+         <ant:checksum file="${maven.dist.dir}/${maven.final.name}.pom" property="pom.md5"/>
+         <ant:echo message="${pom.md5} *${maven.final.name}.pom" 
+                   file="${maven.dist.dir}/${maven.final.name}.pom.md5" />
+
+         <copy todir="${maven.dist.dir}">
+             <fileset file='${maven.build.dir}/${maven.final.name}.jar'/>
+             <fileset file='${maven.dist.bin.assembly.dir}/${maven.final.name}-sources.jar'/>
+             <fileset file='${maven.dist.bin.assembly.dir}/${maven.final.name}-javadoc.jar'/>
+         </copy>
+
+         <!-- create checksum for jar -->
+         <ant:checksum file="${maven.dist.dir}/${maven.final.name}.jar" property="jar.md5"/>
+         <ant:echo message="${jar.md5} *${maven.final.name}.jar" 
+                   file="${maven.dist.dir}/${maven.final.name}.jar.md5" />
+
+         <!-- create checksum for sources jar -->
+         <ant:checksum file="${maven.dist.dir}/${maven.final.name}-sources.jar" property="jar.md5"/>
+         <ant:echo message="${jar.md5} *${maven.final.name}-sources.jar" 
+                   file="${maven.dist.dir}/${maven.final.name}-sources.jar.md5" />
+
+         <!-- create checksum for javadoc jar -->
+         <ant:checksum file="${maven.dist.dir}/${maven.final.name}-javadoc.jar" property="jar.md5"/>
+         <ant:echo message="${jar.md5} *${maven.final.name}-javadoc.jar" 
+                   file="${maven.dist.dir}/${maven.final.name}-javadoc.jar.md5" />
+
+         <!-- create checksum for binary zip -->
+         <ant:checksum file="${maven.dist.dir}/${maven.final.name}.zip" property="zip.md5"/>
+         <ant:echo message="${zip.md5} *${maven.final.name}.zip" 
+                   file="${maven.dist.dir}/${maven.final.name}.zip.md5" />
+
+         <!-- create checksum for binary tar.gz -->
+         <ant:checksum file="${maven.dist.dir}/${maven.final.name}.tar.gz" property="tar.gz.md5"/>
+         <ant:echo message="${tar.gz.md5} *${maven.final.name}.tar.gz" 
+                   file="${maven.dist.dir}/${maven.final.name}.tar.gz.md5" />
+
+         <!-- create checksum for source zip -->
+         <ant:checksum file="${maven.dist.dir}/${maven.final.name}-src.zip" property="src.zip.md5"/>
+         <ant:echo message="${src.zip.md5} *${maven.final.name}-src.zip" 
+                   file="${maven.dist.dir}/${maven.final.name}-src.zip.md5" />
+
+         <!-- create checksum for source tar.gz -->
+         <ant:checksum file="${maven.dist.dir}/${maven.final.name}-src.tar.gz" property="src.tar.gz.md5"/>
+         <ant:echo message="${src.tar.gz.md5} *${maven.final.name}-src.tar.gz" 
+                   file="${maven.dist.dir}/${maven.final.name}-src.tar.gz.md5" />
+
+    </postGoal>
   
 </project>

Modified: jakarta/commons/proper/el/trunk/project.properties
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/el/trunk/project.properties?view=diff&rev=547847&r1=547846&r2=547847
==============================================================================
--- jakarta/commons/proper/el/trunk/project.properties (original)
+++ jakarta/commons/proper/el/trunk/project.properties Fri Jun 15 19:22:51 2007
@@ -17,8 +17,10 @@
 
 maven.changelog.factory=org.apache.maven.svnlib.SvnChangeLogFactory
 
+maven.compile.source=1.4
+maven.compile.target=1.4
+
 # documentation properties
-maven.xdoc.jsl=../commons-build/commons-site.jsl
 maven.xdoc.date=left
 maven.xdoc.version=${pom.currentVersion}
 maven.xdoc.developmentProcessUrl=http://jakarta.apache.org/commons/charter.html
@@ -29,3 +31,6 @@
 maven.jar.manifest.attribute.Implementation-Vendor-Id=org.apache
 maven.jar.manifest.attribute.X-Compile-Source-JDK=${maven.compile.source}
 maven.jar.manifest.attribute.X-Compile-Target-JDK=${maven.compile.target}
+
+# Make the source distro unzip to a different directory
+maven.dist.src.assembly.dir=${maven.dist.assembly.dir}/src/${maven.final.name}-src

Modified: jakarta/commons/proper/el/trunk/project.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/el/trunk/project.xml?view=diff&rev=547847&r1=547846&r2=547847
==============================================================================
--- jakarta/commons/proper/el/trunk/project.xml (original)
+++ jakarta/commons/proper/el/trunk/project.xml Fri Jun 15 19:22:51 2007
@@ -60,13 +60,13 @@
       <name>Commons Dev List</name>
       <subscribe>commons-dev-subscribe@jakarta.apache.org</subscribe>
       <unsubscribe>commons-dev-unsubscribe@jakarta.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-dev@jakarta.apache.org</archive>
+      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/</archive>
     </mailingList>
     <mailingList>
       <name>Commons User List</name>
       <subscribe>commons-user-subscribe@jakarta.apache.org</subscribe>
       <unsubscribe>commons-user-unsubscribe@jakarta.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/eyebrowse/SummarizeList?listName=commons-user@jakarta.apache.org</archive>
+      <archive>http://mail-archives.apache.org/mod_mbox/jakarta-commons-user/</archive>
     </mailingList>
   </mailingLists>
   
@@ -108,11 +108,17 @@
       <groupId>servletapi</groupId>
       <artifactId>servletapi</artifactId>
       <version>2.4</version>
+      <properties>
+          <scope>provided</scope>
+      </properties>
     </dependency>
     <dependency>
       <groupId>jspapi</groupId>
       <artifactId>jsp-api</artifactId>
       <version>2.0</version>
+      <properties>
+          <scope>provided</scope>
+      </properties>
     </dependency>
     <dependency>
       <groupId>commons-logging</groupId>
@@ -145,6 +151,15 @@
         <include>**/*Test.java</include>
       </includes>
     </unitTest>
+    <resources>
+      <resource>
+        <directory>${basedir}</directory>
+        <targetPath>META-INF</targetPath>
+        <includes>
+          <include>NOTICE.txt</include>
+        </includes>
+      </resource>
+    </resources>
   </build>
   
   <reports>

Added: jakarta/commons/proper/el/trunk/xdocs/cvs-usage.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/el/trunk/xdocs/cvs-usage.xml?view=auto&rev=547847
==============================================================================
--- jakarta/commons/proper/el/trunk/xdocs/cvs-usage.xml (added)
+++ jakarta/commons/proper/el/trunk/xdocs/cvs-usage.xml Fri Jun 15 19:22:51 2007
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!-- 
+/*
+ * 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.
+ */
+ -->
+
+<document>
+ <properties>
+  <title>Source repository</title>
+  <author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author>
+ </properties>
+ <body>
+<!-- ================================================== -->
+<section name="Source repository">
+<p>
+  Jakarta Commons EL is hosted on the Apache
+  <a href="http://subversion.tigris.org/">subversion</a> repository.
+</p>
+<p>
+  The project URL is:<br />
+  <code>http://svn.apache.org/repos/asf/jakarta/commons/proper/el/trunk</code>
+</p>
+<p>
+  The best way to view the repository is via the
+  <a href="http://svn.apache.org/viewvc/jakarta/commons/proper/el/trunk/">subversion
viewer</a>.
+</p>
+<p>
+  The alternative is to use the
+  <a href="http://svn.apache.org/repos/asf/jakarta/commons/proper/el/trunk/">native
subversion</a> display.
+</p>
+<p>
+  For more information on subversion and creating patches see the
+  <a href="http://www.apache.org/dev/contributors.html">Apache Contributors Guide</a>.
+</p>
+</section>
+<!-- ================================================== -->
+</body>
+</document>
\ No newline at end of file

Propchange: jakarta/commons/proper/el/trunk/xdocs/cvs-usage.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/commons/proper/el/trunk/xdocs/cvs-usage.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: jakarta/commons/proper/el/trunk/xdocs/issue-tracking.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/el/trunk/xdocs/issue-tracking.xml?view=auto&rev=547847
==============================================================================
--- jakarta/commons/proper/el/trunk/xdocs/issue-tracking.xml (added)
+++ jakarta/commons/proper/el/trunk/xdocs/issue-tracking.xml Fri Jun 15 19:22:51 2007
@@ -0,0 +1,72 @@
+<?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.
+-->
+<document>
+ <properties>
+  <title>Issue tracking</title>
+  <author email="commons-dev@jakarta.apache.org">Commons Documentation Team</author>
+ </properties>
+<body>
+<!-- ================================================== -->
+<section name="Issue tracking">
+<p>
+  Commons EL uses <a href="http://issues.apache.org/jira/">ASF JIRA</a> for for
tracking issues.
+  See the <a href="http://issues.apache.org/jira/browse/EL">EL JIRA project page</a>.
+</p>
+<p>
+  To use JIRA you may need to <a href="http://issues.apache.org/jira/secure/Signup!default.jspa">create
an account</a>
+  (if you have previously created/updated Commons issues using Bugzilla an account will have
been automatically
+  created and you can use the <a href="http://issues.apache.org/jira/secure/ForgotPassword!default.jspa">Forgot
Password</a>
+  page to get a new password).
+</p>
+<p>
+  If you would like to report a bug, or raise an enhancement request with
+  Commons EL please do the following:
+  <ol>
+  <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310473&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=4">Search
existing open bugs</a>.
+  If you find your issue listed then please add a comment with your details.</li>
+  <li><a href="http://mail-archives.apache.org/mod_mbox/jakarta-commons-dev/">Search
the mailing list archive</a>.
+  You may find your issue or idea has already been discussed.</li>
+  <li>Decide if your issue is a bug or an enhancement.</li>
+  <li>Submit either a <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310473&amp;issuetype=1&amp;priority=4&amp;assignee=-1">bug
report</a>
+  or <a href="http://issues.apache.org/jira/secure/CreateIssueDetails!init.jspa?pid=12310473&amp;issuetype=4&amp;priority=4&amp;assignee=-1">enhancement
request</a>.</li>
+  </ol>
+</p>
+<p>
+  Please also remember these points:
+  <ul>
+  <li>the more information you provide, the better we can help you</li>
+  <li>test cases are vital, particularly for any proposed enhancements</li>
+  <li>the developers of Commons EL are all unpaid volunteers</li>
+  </ul>
+</p>
+<p>
+  For more information on subversion and creating patches see the
+  <a href="http://www.apache.org/dev/contributors.html">Apache Contributors Guide</a>.
+</p>
+<p>
+  You may also find these links useful:
+  <ul>
+  <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310473&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=1&amp;status=4">All
Open EL bugs</a></li>
+  <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310473&amp;sorter/field=issuekey&amp;sorter/order=DESC&amp;status=5&amp;status=6">All
Resolved EL bugs</a></li>
+  <li><a href="http://issues.apache.org/jira/secure/IssueNavigator.jspa?reset=true&amp;pid=12310473&amp;sorter/field=issuekey&amp;sorter/order=DESC">All
EL bugs</a></li>
+  </ul>
+</p>
+</section>
+<!-- ================================================== -->
+</body>
+</document>

Propchange: jakarta/commons/proper/el/trunk/xdocs/issue-tracking.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/commons/proper/el/trunk/xdocs/issue-tracking.xml
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: jakarta/commons/proper/el/trunk/xdocs/navigation.xml
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/el/trunk/xdocs/navigation.xml?view=diff&rev=547847&r1=547846&r2=547847
==============================================================================
--- jakarta/commons/proper/el/trunk/xdocs/navigation.xml (original)
+++ jakarta/commons/proper/el/trunk/xdocs/navigation.xml Fri Jun 15 19:22:51 2007
@@ -15,7 +15,7 @@
    See the License for the specific language governing permissions and
    limitations under the License.
 -->
-<!DOCTYPE org.apache.commons.menus SYSTEM '../../commons-build/menus/menus.dtd'>
+<!DOCTYPE org.apache.commons.menus SYSTEM 'http://jakarta.apache.org/commons/build/maven-build.dtd'>
 <project name="EL">
 
   <title>EL</title>
@@ -25,20 +25,22 @@
 
   <body>
     <links>
-      <item name="Jakarta Commons"                   
-            href="http://jakarta.apache.org/commons/"/>
+      <item name="Apache"  href="http://www.apache.org"/>
+      <item name="Jakarta" href="http://jakarta.apache.org"/>
+      <item name="Commons" href="http://jakarta.apache.org/commons/"/>
     </links>
 
     <menu name="Commons EL">
       <item name="Overview" href="/index.html"/>
       <item name="Javadoc (Release)" href="api/index.html"/>
       <item name="Mailing lists" href="/mail-lists.html"/>
+      <item name="Issue Tracking"          href="/issue-tracking.html"/>
       <item name="Team" href="/team-list.html"/>
       <item name="Proposal" href="/proposal.html"/>
-      <item name="CVS" href="http://cvs.apache.org/viewcvs/jakarta-commons/el/"/>
-      <item name="Javadoc (CVS latest)" href="apidocs/index.html"/>
+      <item name="Source Repository" href="/cvs-usage.html"/>
+      <item name="Javadoc (latest)" href="apidocs/index.html"/>
     </menu>
     
-    &common-menus;
+    &commons;
   </body>
 </project>

Modified: jakarta/commons/proper/el/trunk/xdocs/style/project.css
URL: http://svn.apache.org/viewvc/jakarta/commons/proper/el/trunk/xdocs/style/project.css?view=diff&rev=547847&r1=547846&r2=547847
==============================================================================
--- jakarta/commons/proper/el/trunk/xdocs/style/project.css (original)
+++ jakarta/commons/proper/el/trunk/xdocs/style/project.css Fri Jun 15 19:22:51 2007
@@ -1,9 +1 @@
-#banner, #banner td { 
- background: #fff;
- color: #000;
-}
-
-#banner td { 
- height: 100%;
- vertical-align: middle;
-}
+@import url("http://jakarta.apache.org/style/jakarta-maven.css");



---------------------------------------------------------------------
To unsubscribe, e-mail: commons-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: commons-dev-help@jakarta.apache.org


Mime
View raw message