You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by an...@apache.org on 2014/05/06 18:02:45 UTC
svn commit: r1592790 - in /tomee/site/trunk/content:
dev/release-tomee.mdtext documentation.mdtext
understanding-the-directory-layout.mdtext weblogic.mdtext
Author: andygumbrecht
Date: Tue May 6 16:02:45 2014
New Revision: 1592790
URL: http://svn.apache.org/r1592790
Log:
Small fixes
Modified:
tomee/site/trunk/content/dev/release-tomee.mdtext
tomee/site/trunk/content/documentation.mdtext
tomee/site/trunk/content/understanding-the-directory-layout.mdtext
tomee/site/trunk/content/weblogic.mdtext
Modified: tomee/site/trunk/content/dev/release-tomee.mdtext
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/dev/release-tomee.mdtext?rev=1592790&r1=1592789&r2=1592790&view=diff
==============================================================================
--- tomee/site/trunk/content/dev/release-tomee.mdtext (original)
+++ tomee/site/trunk/content/dev/release-tomee.mdtext Tue May 6 16:02:45 2014
@@ -100,7 +100,8 @@ Once you have your key then you will nee
- [http://www.apache.org/dist/openejb/KEYS](http://www.apache.org/dist/openejb/KEYS)
-That is best done as the file itself explains one you view it in a UTF-8 safe text editor.
+That is best done as the file itself explains, once you open and view it in a UTF-8 safe text editor you will see the description at the top.
+Just follow the instructions there on how to append your key. The basic steps are also here, please read both before you proceed:
- Save the KEYS file on your local machine and import it using **gpg --import KEYS**
- Then create the new KEYS file using **(gpg --list-sigs <your name> && gpg --armor --export <your name>) >> KEYS**
@@ -148,9 +149,22 @@ Once you are happy with the staging you
### Begin The Release Process
-Ensure TCK is passing all tests.
-Open a console on the release tools directory.
+
+Ensure TCK is passing all tests, and if so create an SVN tag from the branch.
+
+ Note: It is a future goal to either separate OpenEJB from TomEE or unify the versions so the
+ [maven-release-plugin](http://maven.apache.org/maven-release/maven-release-plugin/) can be used.
+
+ Because we cannot use the Maven release tools we currently have to create a an SVN tag manually. The best way to do this is to:
+
+ - Copy the branch to a staging branch using: svn copy https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-[version] https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-[version]-staging -m "Staging [version]"
+ - Checkout the staging branch using: svn co https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-[version]-staging tomee-[version]-staging
+ - Update all SNAPSHOT versions to the release versions in the local tomee-[version]-staging and commit.
+ - Create the tag from the staging: svn copy https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-[version]-staging https://svn.apache.org/repos/asf/tomee/tomee/tags/tomee-[version] -m "Tag [version]"
+ - Delete the staging branch using: svn rm https://svn.apache.org/repos/asf/tomee/tomee/branches/tomee-[version]-staging -m "Delete staging"
+
+Open a console on the release-tools directory.
Note: Before running any **./run.sh** activity always check the release tools code for the command tomee-release-tools/src/main/java/org/apache/openejb/tools/release/cmd.
At the moment some of the commands need manually editing to work. Eventually the commands should be re-written.
@@ -161,7 +175,7 @@ All JIRA actions should be performed on
Ensure JIRAs have been filed for commits using **./run.sh reviewcommits**
-Update fixVersions for JIRAs used in SVN commits using **./run.sh updatejiras**
+Update fixVersions for JIRAs used in SVN commits using **./run.sh updatejiras** - *Untested, requires investigation*
Review and bulk Close all JIRAs for the version to be released.
@@ -179,12 +193,6 @@ Update trunk versions. How you do this i
Create the next version iterations in JIRA.
-Resolve all SNAPSHOT dependencies in the branch against release versions. This includes the modules themselves.
-The reason for this is that an SVN TAG is taken straight off the branch during the next step.
-
- Note: It is a future goal to either separate OpenEJB from TomEE or unify the versions so the
- [maven-release-plugin](http://maven.apache.org/maven-release/maven-release-plugin/) can be used.
-
### Rolling Out The Preview
Publish the preview using **./run.sh roll binaries legal releasenotes preview** - You can run these tasks like so, or individually in order.
Modified: tomee/site/trunk/content/documentation.mdtext
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/documentation.mdtext?rev=1592790&r1=1592789&r2=1592790&view=diff
==============================================================================
--- tomee/site/trunk/content/documentation.mdtext (original)
+++ tomee/site/trunk/content/documentation.mdtext Tue May 6 16:02:45 2014
@@ -1,6 +1,7 @@
-Title: Index
+Title: Documentation
-See also the [examples page](examples-trunk/index.html) for downloadable, executable and code-focused view of Java EE and TomEE.
+See also the [examples page](examples-trunk/index.html) for downloadable, executable and code-focused view of Java EE and TomEE.
+You can also find us on IRC freenode.org #openejb
{row
@@ -85,7 +86,7 @@ See also the [examples page](examples-tr
###TomEE Maven Plugin
[Getting started](tomee-mp-getting-started.html)
[tomee-maven-plugin reference documentation](tomee-maven-plugin.html)
-[TomEE simple webapp archetype documentation](tomee-mp-getting-started.mdtext.html)
+[TomEE simple webapp archetype documentation](tomee-mp-getting-started.html)
}
{span-one-third
###Tips and Tricks
Modified: tomee/site/trunk/content/understanding-the-directory-layout.mdtext
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/understanding-the-directory-layout.mdtext?rev=1592790&r1=1592789&r2=1592790&view=diff
==============================================================================
--- tomee/site/trunk/content/understanding-the-directory-layout.mdtext (original)
+++ tomee/site/trunk/content/understanding-the-directory-layout.mdtext Tue May 6 16:02:45 2014
@@ -1,19 +1,16 @@
Title: Understanding the Directory Layout
-When freshly unpacked, OpenEJB will look like this:
- openejb-3.0/
- openejb-3.0/logs/
- openejb-3.0/apps/
- openejb-3.0/lib/
- openejb-3.0/lib/_<several jars>_
- openejb-3.0/LICENSE.txt
- openejb-3.0/NOTICE.txt
- openejb-3.0/README.txt
- openejb-3.0/bin/
- openejb-3.0/bin/openejb.bat
- openejb-3.0/bin/openejb
- openejb-3.0/conf/
- openejb-3.0/conf/README.txt
+Unpacking the standalone OpenEJB will result in the following directory layout:
+
+ apache-openejb-[version]\apps
+ apache-openejb-[version]\bin
+ apache-openejb-[version]\conf
+ apache-openejb-[version]\data
+ apache-openejb-[version]\lib
+ apache-openejb-[version]\logs
+ apache-openejb-[version]\LICENSE
+ apache-openejb-[version]\NOTICE
+ apache-openejb-[version]\README.txt
<a name="UnderstandingtheDirectoryLayout-Directories"></a>
# Directories
@@ -50,22 +47,20 @@ This directory contains nothing but a RE
is unpacked. The first time OpenEJB is started however, these files will
be created:
-
conf/
- openejb.xml (main config file)
-
- logging.properties (log levels and files)
-
+ openejb.xml (main config file)
+ logging.properties (log levels and files)
login.config (jaas config file)
users.properties (users that can log in)
groups.properties (groups in which users belong)
- admin.properties (network socket for administration)
- ejbd.properties (network socket for ejb invocations)
- hsql.properties (network socket for hsql client access)
- httpejbd.properties (network socket for ejb invocations over http)
- telnet.properties (network socket for telnet "server")
-
+ conf.d/
+
+ admin.properties (network socket for administration)
+ ejbd.properties (network socket for ejb invocations)
+ hsql.properties (network socket for hsql client access)
+ httpejbd.properties (network socket for ejb invocations over http)
+ telnet.properties (network socket for telnet "server")
These files can be edited as desired. If at any time you are unhappy with
your changes or simply wish to start over, you can delete or move any of
Modified: tomee/site/trunk/content/weblogic.mdtext
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/weblogic.mdtext?rev=1592790&r1=1592789&r2=1592790&view=diff
==============================================================================
--- tomee/site/trunk/content/weblogic.mdtext (original)
+++ tomee/site/trunk/content/weblogic.mdtext Tue May 6 16:02:45 2014
@@ -3,8 +3,8 @@ Title: WebLogic Lookup
How to lookup WebLogic Objects from within a TomEE context:
Hashtable<String, String> props = new Hashtable<String, String>();
- props.put(javax.naming.Context.INITIAL_CONTEXT_FACTORY, **"weblogic.jndi.WLInitialContextFactory"**);
- props.put(javax.naming.Context.URL_PKG_PREFIXES, **"weblogic.jndi.factories"**);
+ props.put(javax.naming.Context.INITIAL_CONTEXT_FACTORY, "weblogic.jndi.WLInitialContextFactory");
+ props.put(javax.naming.Context.URL_PKG_PREFIXES, "weblogic.jndi.factories");
props.put("java.naming.provider.url", "t3://your.host.name:7023");
Context ctx = new InitialContext(props);