You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by st...@apache.org on 2015/03/05 11:57:32 UTC

[1/5] tomee git commit: add termporary overlay folders to SCM ignore list

Repository: tomee
Updated Branches:
  refs/heads/develop 83c6ebfe4 -> 408a68667


add termporary overlay folders to SCM ignore list


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/07a6ccb9
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/07a6ccb9
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/07a6ccb9

Branch: refs/heads/develop
Commit: 07a6ccb963de31508f5eb88d231db2e6598a88e2
Parents: d1cfde9
Author: Mark Struberg <st...@apache.org>
Authored: Thu Mar 5 10:50:34 2015 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Thu Mar 5 11:53:04 2015 +0100

----------------------------------------------------------------------
 .gitignore | 2 ++
 1 file changed, 2 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/07a6ccb9/.gitignore
----------------------------------------------------------------------
diff --git a/.gitignore b/.gitignore
index 0e24d28..92dd6e3 100644
--- a/.gitignore
+++ b/.gitignore
@@ -8,3 +8,5 @@ target
 *.log
 *~
 quick.bat
+/tomee/tomee-plume-webapp/overlays/
+/tomee/tomee-plus-webapp/overlays/


[3/5] tomee git commit: fix release setup for GIT

Posted by st...@apache.org.
fix release setup for GIT


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/8fa8097c
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/8fa8097c
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/8fa8097c

Branch: refs/heads/develop
Commit: 8fa8097c258e31bc427e0ea77e1cb7eb96daf259
Parents: 83c6ebf
Author: Mark Struberg <st...@apache.org>
Authored: Thu Jan 29 17:59:22 2015 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Thu Mar 5 11:53:04 2015 +0100

----------------------------------------------------------------------
 pom.xml | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/8fa8097c/pom.xml
----------------------------------------------------------------------
diff --git a/pom.xml b/pom.xml
index 0262f78..89c7485 100644
--- a/pom.xml
+++ b/pom.xml
@@ -310,11 +310,6 @@
           <version>2.13</version>
         </plugin>
         <plugin>
-          <groupId>org.apache.maven.plugins</groupId>
-          <artifactId>maven-release-plugin</artifactId>
-          <version>2.5.1</version>
-        </plugin>
-        <plugin>
           <groupId>org.codehaus.gmaven</groupId>
           <artifactId>groovy-maven-plugin</artifactId>
           <version>2.0</version>
@@ -330,6 +325,20 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-release-plugin</artifactId>
+        <version>2.5.1</version>
+        <configuration>
+          <autoVersionSubmodules>true</autoVersionSubmodules>
+
+          <!-- the following settings are important when working with git -->
+          <localCheckout>true</localCheckout>
+          <pushChanges>false</pushChanges>
+          <releaseProfiles></releaseProfiles>
+        </configuration>
+      </plugin>
+
+      <plugin>
+        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.7</source>


[2/5] tomee git commit: add a simple readme with building instructions as a start

Posted by st...@apache.org.
add a simple readme with building instructions as a start


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/d1cfde94
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/d1cfde94
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/d1cfde94

Branch: refs/heads/develop
Commit: d1cfde9489acca18b6838ba128da25f1c350d0ad
Parents: b9623bd
Author: Mark Struberg <st...@apache.org>
Authored: Thu Mar 5 10:50:08 2015 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Thu Mar 5 11:53:04 2015 +0100

----------------------------------------------------------------------
 README.md | 13 +++++++++++++
 1 file changed, 13 insertions(+)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/d1cfde94/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
new file mode 100644
index 0000000..8a4f61e
--- /dev/null
+++ b/README.md
@@ -0,0 +1,13 @@
+Title: Buildling Instructions
+
+Apache TomEE is built with Apache Maven.
+
+Simply use
+`$> mvn clean install`
+on your commandline to kick off the compile process of TomEE
+
+
+If you intend building in environments where multicast is not allowed
+then build with:
+ `$> mvn clean install -DskipMulticastTests=true`
+ 


[5/5] tomee git commit: add more build instructions regarding quick build

Posted by st...@apache.org.
add more build instructions regarding quick build


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/408a6866
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/408a6866
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/408a6866

Branch: refs/heads/develop
Commit: 408a6866739e8a33c2ad0c30e9d57eb1ddd30ced
Parents: 07a6ccb
Author: Mark Struberg <st...@apache.org>
Authored: Thu Mar 5 11:57:01 2015 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Thu Mar 5 11:57:01 2015 +0100

----------------------------------------------------------------------
 README.md | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/408a6866/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index 8a4f61e..598d85b 100644
--- a/README.md
+++ b/README.md
@@ -1,13 +1,28 @@
 Title: Buildling Instructions
 
+# Basic Usage
+
 Apache TomEE is built with Apache Maven.
 
 Simply use
+
 `$> mvn clean install`
+
 on your commandline to kick off the compile process of TomEE
 
 
 If you intend building in environments where multicast is not allowed
 then build with:
- `$> mvn clean install -DskipMulticastTests=true`
+
+`$> mvn clean install -DskipMulticastTests=true`
+
+ 
+# Quick Build
+ 
+If you only like to compile all classes and package up TomEE *without* running tests
+then you can use the following build options
+
+`mvn -Pquick -Dsurefire.useFile=false -DdisableXmlReport=true -DuniqueVersion=false -ff -Dassemble -DskipTests -DfailIfNoTests=false clean install`
+
+
  


[4/5] tomee git commit: add a switch to disable multicast tests

Posted by st...@apache.org.
add a switch to disable multicast tests

This is intended building in environments where multicast is not allowed.
In that case just build with. $> mvn clean install -DskipMulticastTests=true


Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/b9623bd9
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/b9623bd9
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/b9623bd9

Branch: refs/heads/develop
Commit: b9623bd982fdcd4f133680d4b3121e696b1c6627
Parents: 8fa8097
Author: Mark Struberg <st...@apache.org>
Authored: Thu Mar 5 09:14:03 2015 +0100
Committer: Mark Struberg <st...@apache.org>
Committed: Thu Mar 5 11:53:04 2015 +0100

----------------------------------------------------------------------
 .../server/discovery/MulticastPulseAgentTest.java    |  9 +++++++++
 .../discovery/MultipointDiscoveryAgentTest.java      | 15 ---------------
 2 files changed, 9 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/tomee/blob/b9623bd9/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MulticastPulseAgentTest.java
----------------------------------------------------------------------
diff --git a/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MulticastPulseAgentTest.java b/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MulticastPulseAgentTest.java
index a9d3aa4..223a768 100644
--- a/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MulticastPulseAgentTest.java
+++ b/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MulticastPulseAgentTest.java
@@ -48,6 +48,7 @@ import java.util.concurrent.Future;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.atomic.AtomicBoolean;
 import java.util.concurrent.locks.ReentrantLock;
+import java.util.logging.Logger;
 
 @SuppressWarnings("UseOfSystemOutOrSystemErr")
 public class MulticastPulseAgentTest {
@@ -96,6 +97,10 @@ public class MulticastPulseAgentTest {
      */
     @Test
     public void test() throws Exception {
+        if ("true".equals(System.getProperty("skipMulticastTests"))) {
+            Logger.getLogger(this.getClass().getName()).warning("Skipping MulticastTest " + this.getClass().getName());
+            return;
+        }
 
         final InetAddress ia;
 
@@ -393,6 +398,10 @@ public class MulticastPulseAgentTest {
 
     @Test
     public void testBroadcastBadUri() throws Exception {
+        if ("true".equals(System.getProperty("skipMulticastTests"))) {
+            Logger.getLogger(this.getClass().getName()).warning("Skipping MulticastTest " + this.getClass().getName());
+            return;
+        }
 
         final DiscoveryListener original = agent.getDiscoveryListener();
 

http://git-wip-us.apache.org/repos/asf/tomee/blob/b9623bd9/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgentTest.java
----------------------------------------------------------------------
diff --git a/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgentTest.java b/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgentTest.java
index d711b7b..54b4b98 100644
--- a/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgentTest.java
+++ b/server/openejb-multicast/src/test/java/org/apache/openejb/server/discovery/MultipointDiscoveryAgentTest.java
@@ -48,23 +48,8 @@ import java.util.logging.Logger;
  */
 public class MultipointDiscoveryAgentTest extends TestCase {
 
-//    static {
-//        final FilteredHandler consoleHandler = new FilteredHandler(new ConsoleHandler(), new LogRecordFilter() {
-//            @Override
-//            public boolean accept(LogRecord record) {
-//                return Thread.currentThread().getName().contains("red");
-//            }
-//        });
-//        consoleHandler.setLevel(Level.FINEST);
-//
-//        final Logger logger = Logger.getLogger("OpenEJB.server.discovery");
-//        logger.addHandler(consoleHandler);
-//        logger.setLevel(Level.FINEST);
-//        logger.setUseParentHandlers(false);
-//    }
 
     public void test() throws Exception {
-//        System.setProperty("logging.level.OpenEJB.server.discovery", "debug");
 
         final URI testService = new URI("green://localhost:0");