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/07/11 13:35:18 UTC

svn commit: r1609693 - in /tomee/site/trunk/content: deploying-in-tomee.mdtext dev/release-tomee.mdtext

Author: andygumbrecht
Date: Fri Jul 11 11:35:17 2014
New Revision: 1609693

URL: http://svn.apache.org/r1609693
Log:
Info

Modified:
    tomee/site/trunk/content/deploying-in-tomee.mdtext
    tomee/site/trunk/content/dev/release-tomee.mdtext

Modified: tomee/site/trunk/content/deploying-in-tomee.mdtext
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/deploying-in-tomee.mdtext?rev=1609693&r1=1609692&r2=1609693&view=diff
==============================================================================
--- tomee/site/trunk/content/deploying-in-tomee.mdtext (original)
+++ tomee/site/trunk/content/deploying-in-tomee.mdtext Fri Jul 11 11:35:17 2014
@@ -22,7 +22,7 @@ Deploying applications in TomEE is as si
 
 You could deploy your application in Eclipse just like how you would deploy with Tomcat. For an example, [tomee-and-eclipse](tomee-and-eclipse.html) shows how to use TomEE with Eclipse.
 
-Or you can simply package your application as a standard **WAR** file and copy it to the **[[TomEE]]/webapps** folder, or as an **EAR** file and copy it to the **[[TomEE]]/apps** folder.
+Or you can simply package your application as a standard **WAR** file and copy it to the **[TomEE]/webapps** folder, or as an **EAR** file and copy it to the **[TomEE]/apps** folder.
 
 Read on to learn more about packaging EJBs in a WAR file.
 
@@ -32,11 +32,16 @@ Read on to learn more about packaging EJ
 <a name="CollapsedEAR-Onearchive"></a>
 #### One archive
 
-The basic idea of this approach is that your Servlets and EJBs are together in your WAR file as one application.  
+The basic idea of this approach is that your Servlets and EJBs are together in your WAR file as one application.
+
  - No classloader boundaries between Servlets and EJBs
+ 
  - EJBs and Servlets can share all third-party libraries (like Spring\!) 
+ 
  - No EAR required.
+ 
  - Can put the web.xml and ejb-jar.xml in the same archive (the WAR file) 
+ 
  - EJBs can see Servlet classes and vice versa 
 
 <a name="CollapsedEAR-NotquiteJ2EE(itistrulyJava EE6)"></a>

Modified: tomee/site/trunk/content/dev/release-tomee.mdtext
URL: http://svn.apache.org/viewvc/tomee/site/trunk/content/dev/release-tomee.mdtext?rev=1609693&r1=1609692&r2=1609693&view=diff
==============================================================================
--- tomee/site/trunk/content/dev/release-tomee.mdtext (original)
+++ tomee/site/trunk/content/dev/release-tomee.mdtext Fri Jul 11 11:35:17 2014
@@ -44,12 +44,12 @@ Run **ant -f rat.xml > report.txt** on t
  
 Pre-authenticate svn repositories to ensure your credentials are cached before using any tools.
 
-	svn mkdir --username [[apacheuser]] --password [[apachepw]] -m "Create test dir" https://svn.apache.org/repos/asf/tomee/tomee/branches/testdir
-	svn delete --username [[apacheuser]] --password [[apachepw]] -m "Delete test dir" https://svn.apache.org/repos/asf/tomee/tomee/branches/testdir
-	svn mkdir --username [[apacheuser]] --password [[apachepw]] -m "Create test dir" https://repository.apache.org/content/repositories/testdir
-	svn delete --username [[apacheuser]] --password [[apachepw]] -m "Delete test dir" https://repository.apache.org/content/repositories/testdir
-	svn mkdir --username [[apacheuser]] --password [[apachepw]] -m "Create test dir" https://dist.apache.org/repos/dist/dev/tomee/testdir
-	svn delete --username [[apacheuser]] --password [[apachepw]] -m "Delete test dir" https://dist.apache.org/repos/dist/dev/tomee/testdir
+	svn mkdir --username [apacheuser] --password [apachepw] -m "Create test dir" https://svn.apache.org/repos/asf/tomee/tomee/branches/testdir
+	svn delete --username [apacheuser] --password [apachepw] -m "Delete test dir" https://svn.apache.org/repos/asf/tomee/tomee/branches/testdir
+	svn mkdir --username [apacheuser] --password [apachepw] -m "Create test dir" https://repository.apache.org/content/repositories/testdir
+	svn delete --username [apacheuser] --password [apachepw] -m "Delete test dir" https://repository.apache.org/content/repositories/testdir
+	svn mkdir --username [apacheuser] --password [apachepw] -m "Create test dir" https://dist.apache.org/repos/dist/dev/tomee/testdir
+	svn delete --username [apacheuser] --password [apachepw] -m "Delete test dir" https://dist.apache.org/repos/dist/dev/tomee/testdir
 
 ###Prepare Maven Authentication
 
@@ -117,7 +117,8 @@ Just follow the instructions there on ho
 
 Checkout the release tools using SVN from here [https://svn.apache.org/repos/asf/tomee/sandbox/release-tools](https://svn.apache.org/repos/asf/tomee/sandbox/release-tools)
 
-Really read the README.mdtext and follow the instructions for building the 3rd party libraries.
+Really read the README.mdtext and follow the instructions for building the 3rd party libraries.  
+Basically SVN checkout and compile [Swizzle](https://svn.codehaus.org/swizzle/trunk) and [Tentacles](https://svn.apache.org/repos/asf/creadur/tentacles/trunk)
 
 Build the release tools, *mvn clean install -DskipTests -DfailIfNoTests=false*