commons-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From chtom...@apache.org
Subject svn commit: r1807022 - in /commons/proper/jelly/branches/1.X: BUILDING.md CONTRIBUTING.md RELEASE-NOTES.txt
Date Sat, 02 Sep 2017 01:24:13 GMT
Author: chtompki
Date: Sat Sep  2 01:24:13 2017
New Revision: 1807022

URL: http://svn.apache.org/viewvc?rev=1807022&view=rev
Log:
(docs) Contributing and Building

Added:
    commons/proper/jelly/branches/1.X/BUILDING.md
    commons/proper/jelly/branches/1.X/CONTRIBUTING.md
Modified:
    commons/proper/jelly/branches/1.X/RELEASE-NOTES.txt

Added: commons/proper/jelly/branches/1.X/BUILDING.md
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/1.X/BUILDING.md?rev=1807022&view=auto
==============================================================================
--- commons/proper/jelly/branches/1.X/BUILDING.md (added)
+++ commons/proper/jelly/branches/1.X/BUILDING.md Sat Sep  2 01:24:13 2017
@@ -0,0 +1,112 @@
+Building the 1.X branch.
+========================
+
+As this code is fairly old, we have constructed a docker container for the purpose of building
the `1.X` branch. For the sake of completeness, the code for that container is availble below.
+
+### Building the container.
+
+Once you have the below 4 files in place, you can run
+
+`docker build -t commons-jelly-build-env .`
+
+from the directory containing the files, assuming that you have docker installed.
+
+#### Dockerfile.
+
+*Note.* You will need the java 1.5.0 installer for this container in the
+directory along with the docker file. Specifically, we used:  jdk-1_5_0_22-linux-amd64.bin
+
+```dockerfile
+# DESCRIPTION:    commons-jelly-build-env
+# SOURCE:         https://github.com/chtompki/Dockerfiles/tree/master/commons-jelly-build-env
+
+FROM library/ubuntu:12.04
+
+RUN apt-get -qq update && apt-get install -y curl wget pgp subversion
+
+RUN mkdir -p /usr/java
+
+ADD jdk-1_5_0_22-linux-amd64.bin /tmp
+ADD answer.txt /tmp
+ADD install.sh /tmp
+
+RUN chmod +x /tmp/install.sh && sh /tmp/install.sh
+
+ENV JAVA_HOME=/usr/java
+ENV PATH=${PATH}:${JAVA_HOME}/bin:/opt/ant/bin
+```
+
+#### answer.txt
+
+This is needed mainly as the standard in for the jdk.1.5.0_b22 installer. We couldn't find
a way to get around the installer prompting for answers.
+
+```
+q
+yes
+```
+
+#### install.sh
+
+Essentially we're installing java 1.5.0, ant 1.6.0, and downloading the requisite libraries
for compilation purposes.
+
+```bash
+#!/bin/bash -x
+
+cd /tmp
+mv something.bin jdk-1_5_0_22-linux-amd64.bin
+chmod a+x jdk-1_5_0_22-linux-amd64.bin
+./jdk-1_5_0_22-linux-amd64.bin < answer.txt
+mv ./jdk1.5.0_22/* /usr/java
+
+mkdir -p /opt/ant
+curl http://archive.apache.org/dist/ant/binaries/apache-ant-1.6.0-bin.tar.gz -o /tmp/apache-ant-1.6.0-bin.tar.gz
+tar -xf apache-ant-1.6.0-bin.tar.gz -C /opt/ant --strip-components 1
+
+mkdir -p /root/commons-jelly-1.X
+
+mkdir -p /root/.maven/repository/servletapi/jars
+mkdir -p /root/.maven/repository/commons-cli/jars
+mkdir -p /root/.maven/repository/commons-lang/jars
+mkdir -p /root/.maven/repository/commons-discovery/jars
+mkdir -p /root/.maven/repository/forehead/jars
+mkdir -p /root/.maven/repository/jstl/jars
+mkdir -p /root/.maven/repository/junit/jars
+mkdir -p /root/.maven/repository/commons-jexl/jars
+mkdir -p /root/.maven/repository/xml-apis/jars
+mkdir -p /root/.maven/repository/commons-beanutils/jars
+mkdir -p /root/.maven/repository/commons-collections/jars
+mkdir -p /root/.maven/repository/commons-logging/jars
+mkdir -p /root/.maven/repository/dom4j/jars
+mkdir -p /root/.maven/repository/jaxen/jars
+mkdir -p /root/.maven/repository/xerces/jars
+
+curl https://search.maven.org/remotecontent?filepath=javax/servlet/servlet-api/2.3/servlet-api-2.3.jar
-o /root/.maven/repository/servletapi/jars/servletapi-2.3.jar
+curl https://search.maven.org/remotecontent?filepath=commons-cli/commons-cli/1.0/commons-cli-1.0.jar
-o /root/.maven/repository/commons-cli/jars/commons-cli-1.0.jar
+curl https://search.maven.org/remotecontent?filepath=commons-lang/commons-lang/2.0/commons-lang-2.0.jar
-o /root/.maven/repository/commons-lang/jars/commons-lang-2.0.jar
+curl https://search.maven.org/remotecontent?filepath=commons-discovery/commons-discovery/20030211.213356/commons-discovery-20030211.213356.jar
-o /root/.maven/repository/commons-discovery/jars/commons-discovery-20030211.213356.jar
+curl https://search.maven.org/remotecontent?filepath=forehead/forehead/1.0-beta-5/forehead-1.0-beta-5.jar
-o /root/.maven/repository/forehead/jars/forehead-1.0-beta-5.jar
+curl https://search.maven.org/remotecontent?filepath=javax/servlet/jstl/1.0.6/jstl-1.0.6.jar
-o /root/.maven/repository/jstl/jars/jstl-1.0.6.jar
+curl https://search.maven.org/remotecontent?filepath=junit/junit/3.8.1/junit-3.8.1.jar -o
/root/.maven/repository/junit/jars/junit-3.8.1.jar
+curl https://search.maven.org/remotecontent?filepath=commons-jexl/commons-jexl/1.0/commons-jexl-1.0.jar
-o /root/.maven/repository/commons-jexl/jars/commons-jexl-1.0.jar
+curl https://search.maven.org/remotecontent?filepath=xml-apis/xml-apis/1.0.b2/xml-apis-1.0.b2.jar
-o /root/.maven/repository/xml-apis/jars/xml-apis-1.0.b2.jar
+curl https://search.maven.org/remotecontent?filepath=commons-beanutils/commons-beanutils/1.6/commons-beanutils-1.6.jar
-o /root/.maven/repository/commons-beanutils/jars/commons-beanutils-1.6.jar
+curl https://search.maven.org/remotecontent?filepath=commons-collections/commons-collections/2.1/commons-collections-2.1.jar
-o /root/.maven/repository/commons-collections/jars/commons-collections-2.1.jar
+curl https://search.maven.org/remotecontent?filepath=commons-logging/commons-logging/1.0.3/commons-logging-1.0.3.jar
-o /root/.maven/repository/commons-logging/jars/commons-logging-1.0.3.jar
+curl https://search.maven.org/remotecontent?filepath=dom4j/dom4j/1.5.2/dom4j-1.5.2.jar -o
/root/.maven/repository/dom4j/jars/dom4j-1.5.2.jar
+curl https://search.maven.org/remotecontent?filepath=jaxen/jaxen/1.1-beta-4/jaxen-1.1-beta-4.jar
-o /root/.maven/repository/jaxen/jars/jaxen-1.1-beta-4.jar
+curl https://search.maven.org/remotecontent?filepath=xerces/xercesImpl/2.2.1/xercesImpl-2.2.1.jar
-o /root/.maven/repository/xerces/jars/xerces-2.2.1.jar
+
+cp /root/.maven/repository/junit/jars/junit-3.8.1.jar /opt/ant/lib/junit-3.8.1.jar
+```
+
+### Running the container.
+
+We begin by checking the container out into a directory of our choosing on our machine. And,
we'll want to make sure that we have properly shared the directory with the docker daemon
running locally such that we can map a directory into the container. After that we run the
following:
+
+```
+docker run -it -v /path/to/checked/out/commons/jelly:/root/commons-jelly-1.x commons-jelly-build-env
bash
+```
+
+assuming that you ran the exact build command from above (naming the container `commons-jelly-build-env`).
Once here you will be logged in on the command line in the container as the `root` user with
the above installed and your `commons-jelly` directory shared into the directory on the container
`/root/commons-jelly-1.x`. From here you can `cd` to that directory and run any of the ant
commands you wish in the project.
+
+For more details on running within the container refer to the following email on the development
mailing list: http://markmail.org/message/i6lk2zfrcexs3lgq
\ No newline at end of file

Added: commons/proper/jelly/branches/1.X/CONTRIBUTING.md
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/1.X/CONTRIBUTING.md?rev=1807022&view=auto
==============================================================================
--- commons/proper/jelly/branches/1.X/CONTRIBUTING.md (added)
+++ commons/proper/jelly/branches/1.X/CONTRIBUTING.md Sat Sep  2 01:24:13 2017
@@ -0,0 +1,115 @@
+<!---
+ 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.
+-->
+<!---
+ +======================================================================+
+ |****                                                              ****|
+ |****      THIS FILE IS GENERATED BY THE COMMONS BUILD PLUGIN      ****|
+ |****                    DO NOT EDIT DIRECTLY                      ****|
+ |****                                                              ****|
+ +======================================================================+
+ | TEMPLATE FILE: contributing-md-template.md                           |
+ | commons-build-plugin/trunk/src/main/resources/commons-xdoc-templates |
+ +======================================================================+
+ |                                                                      |
+ | 1) Re-generate using: mvn commons:contributing-md                    |
+ |                                                                      |
+ | 2) Set the following properties in the component's pom:              |
+ |    - commons.jira.id  (required, alphabetic, upper case)             |
+ |                                                                      |
+ | 3) Example Properties                                                |
+ |                                                                      |
+ |  <properties>                                                        |
+ |    <commons.jira.id>MATH</commons.jira.id>                           |
+ |  </properties>                                                       |
+ |                                                                      |
+ +======================================================================+
+--->
+Contributing to Apache Commons Jelly
+======================
+
+You have found a bug or you have an idea for a cool new feature? Contributing code is a great
way to give something back to
+the open source community. Before you dig right into the code there are a few guidelines
that we need contributors to
+follow so that we can have a chance of keeping on top of things.
+
+Getting Started
+---------------
+
++ Make sure you have a [JIRA account](https://issues.apache.org/jira/).
++ Make sure you have a [GitHub account](https://github.com/signup/free).
++ If you're planning to implement a new feature it makes sense to discuss you're changes
on the [dev list](https://commons.apache.org/mail-lists.html) first. This way you can make
sure you're not wasting your time on something that isn't considered to be in Apache Commons
Jelly's scope.
++ Submit a [Jira Ticket][jira] for your issue, assuming one does not already exist.
+  + Clearly describe the issue including steps to reproduce when it is a bug.
+  + Make sure you fill in the earliest version that you know has the issue.
++ Find the corresponding [repository on GitHub](https://github.com/apache/?query=commons-),
+[fork](https://help.github.com/articles/fork-a-repo/) and check out your forked repository.
+
+Making Changes
+--------------
+
++ Create a _topic branch_ for your isolated work.
+  * Usually you should base your branch on the `master` or `trunk` branch.
+  * A good topic branch name can be the JIRA bug id plus a keyword, e.g. `JELLY-123-InputStream`.
+  * If you have submitted multiple JIRA issues, try to maintain separate branches and pull
requests.
++ Make commits of logical units.
+  * Make sure your commit messages are meaningful and in the proper format. Your commit message
should contain the key of the JIRA issue.
+  * e.g. `JELLY-123: Close input stream earlier`
++ Respect the original code style:
+  + Only use spaces for indentation.
+  + Create minimal diffs - disable _On Save_ actions like _Reformat Source Code_ or _Organize
Imports_. If you feel the source code should be reformatted create a separate PR for this
change first.
+  + Check for unnecessary whitespace with `git diff` -- check before committing.
++ Make sure you have added the necessary tests for your changes, typically in `src/test/java`.
++ Run all the tests with `mvn clean verify` to assure nothing else was accidentally broken.
+
+Making Trivial Changes
+----------------------
+
+The JIRA tickets are used to generate the changelog for the next release.
+
+For changes of a trivial nature to comments and documentation, it is not always necessary
to create a new ticket in JIRA.
+In this case, it is appropriate to start the first line of a commit with '(doc)' instead
of a ticket number.
+
+
+Submitting Changes
+------------------
+
++ Sign and submit the Apache [Contributor License Agreement][cla] if you haven't already.
+  * Note that small patches & typical bug fixes do not require a CLA as
+    clause 5 of the [Apache License](https://www.apache.org/licenses/LICENSE-2.0.html#contributions)
+    covers them.
++ Push your changes to a topic branch in your fork of the repository.
++ Submit a _Pull Request_ to the corresponding repository in the `apache` organization.
+  * Verify _Files Changed_ shows only your intended changes and does not
+  include additional files like `target/*.class`
++ Update your JIRA ticket and include a link to the pull request in the ticket.
+
+If you prefer to not use GitHub, then you can instead use
+`git format-patch` (or `svn diff`) and attach the patch file to the JIRA issue.
+
+
+Additional Resources
+--------------------
+
++ [Contributing patches](https://commons.apache.org/patches.html)
++ [Apache Commons Jelly JIRA project page][jira]
++ [Contributor License Agreement][cla]
++ [General GitHub documentation](https://help.github.com/)
++ [GitHub pull request documentation](https://help.github.com/send-pull-requests/)
++ [Apache Commons Twitter Account](https://twitter.com/ApacheCommons)
++ `#apache-commons` IRC channel on `irc.freenode.net`
+
+[cla]:https://www.apache.org/licenses/#clas
+[jira]:https://issues.apache.org/jira/browse/JELLY

Modified: commons/proper/jelly/branches/1.X/RELEASE-NOTES.txt
URL: http://svn.apache.org/viewvc/commons/proper/jelly/branches/1.X/RELEASE-NOTES.txt?rev=1807022&r1=1807021&r2=1807022&view=diff
==============================================================================
--- commons/proper/jelly/branches/1.X/RELEASE-NOTES.txt (original)
+++ commons/proper/jelly/branches/1.X/RELEASE-NOTES.txt Sat Sep  2 01:24:13 2017
@@ -1,6 +1,6 @@
-The Jakarta Commons Jelly team is pleased to announce the commons-jelly 1.0.1 release!
+The Apache Commons Jelly team is pleased to announce the commons-jelly 1.0.1 release!
 
-http://jakarta.apache.org/commons/jelly/
+http://commons.apache.org/jelly/
 
 Jelly is a Java and XML based scripting engine. Jelly combines the best ideas 
 from JSTL, Velocity, DVSL, Ant and Cocoon all together in a simple yet 
@@ -13,5 +13,5 @@ Notable changes since the 1.0 release:
 - JELLY-293: Accommodate toggling off DTD external entities.
 
 Have fun!
--The Jelly team
+-The Apache Commons team
       



Mime
View raw message