[exo-jcr-commits] exo-jcr SVN: r5692 - in kernel/branches/2.4.x: exo.kernel.commons and 12 other directories.
do-not-reply at jboss.org
do-not-reply at jboss.org
Thu Feb 23 10:28:01 EST 2012
Author: andrew.plotnikov
Date: 2012-02-23 10:28:00 -0500 (Thu, 23 Feb 2012)
New Revision: 5692
Modified:
kernel/branches/2.4.x/exo.kernel.commons/pom.xml
kernel/branches/2.4.x/exo.kernel.component.cache/pom.xml
kernel/branches/2.4.x/exo.kernel.component.command/pom.xml
kernel/branches/2.4.x/exo.kernel.component.common/pom.xml
kernel/branches/2.4.x/exo.kernel.component.common/src/test/java/org/exoplatform/services/mail/test/TestMailService.java
kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml
kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
kernel/branches/2.4.x/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml
kernel/branches/2.4.x/exo.kernel.container/pom.xml
kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
kernel/branches/2.4.x/pom.xml
Log:
EXOJCR-1771: Checked the scope and the dependency list of each project
Modified: kernel/branches/2.4.x/exo.kernel.commons/pom.xml
===================================================================
--- kernel/branches/2.4.x/exo.kernel.commons/pom.xml 2012-02-22 14:18:12 UTC (rev 5691)
+++ kernel/branches/2.4.x/exo.kernel.commons/pom.xml 2012-02-23 15:28:00 UTC (rev 5692)
@@ -47,10 +47,6 @@
<artifactId>slf4j-log4j12</artifactId>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </dependency>
- <dependency>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>exo.kernel.commons.test</artifactId>
</dependency>
@@ -81,7 +77,7 @@
<id>prepare-test-policy</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <target>
<echo>Creating Access Policy for tests</echo>
<makeurl file="${settings.localRepository}" property="localRepositoryURL" />
<makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -96,7 +92,7 @@
<filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
</filterset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: kernel/branches/2.4.x/exo.kernel.component.cache/pom.xml
===================================================================
--- kernel/branches/2.4.x/exo.kernel.component.cache/pom.xml 2012-02-22 14:18:12 UTC (rev 5691)
+++ kernel/branches/2.4.x/exo.kernel.component.cache/pom.xml 2012-02-23 15:28:00 UTC (rev 5692)
@@ -71,7 +71,7 @@
<id>prepare-test-policy</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <target>
<echo>Creating Access Policy for tests</echo>
<makeurl file="${settings.localRepository}" property="localRepositoryURL" />
<makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -86,7 +86,7 @@
<filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
</filterset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: kernel/branches/2.4.x/exo.kernel.component.command/pom.xml
===================================================================
--- kernel/branches/2.4.x/exo.kernel.component.command/pom.xml 2012-02-22 14:18:12 UTC (rev 5691)
+++ kernel/branches/2.4.x/exo.kernel.component.command/pom.xml 2012-02-23 15:28:00 UTC (rev 5692)
@@ -86,7 +86,7 @@
<id>prepare-test-policy</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <target>
<echo>Creating Access Policy for tests</echo>
<makeurl file="${settings.localRepository}" property="localRepositoryURL" />
<makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -101,7 +101,7 @@
<filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
</filterset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: kernel/branches/2.4.x/exo.kernel.component.common/pom.xml
===================================================================
--- kernel/branches/2.4.x/exo.kernel.component.common/pom.xml 2012-02-22 14:18:12 UTC (rev 5691)
+++ kernel/branches/2.4.x/exo.kernel.component.common/pom.xml 2012-02-23 15:28:00 UTC (rev 5692)
@@ -94,10 +94,6 @@
<artifactId>mail</artifactId>
</dependency>
<dependency>
- <groupId>javax.transaction</groupId>
- <artifactId>jta</artifactId>
- </dependency>
- <dependency>
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
</dependency>
@@ -111,6 +107,11 @@
<artifactId>dumbster</artifactId>
<scope>test</scope>
</dependency>
+ <dependency>
+ <groupId>org.ow2.spec.ee</groupId>
+ <artifactId>ow2-jta-1.1-spec</artifactId>
+ <version>1.0-M1</version>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -145,7 +146,7 @@
<id>prepare-test-policy</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <target>
<echo>Creating Access Policy for tests</echo>
<makeurl file="${settings.localRepository}" property="localRepositoryURL" />
<makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -160,7 +161,7 @@
<filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
</filterset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: kernel/branches/2.4.x/exo.kernel.component.common/src/test/java/org/exoplatform/services/mail/test/TestMailService.java
===================================================================
--- kernel/branches/2.4.x/exo.kernel.component.common/src/test/java/org/exoplatform/services/mail/test/TestMailService.java 2012-02-22 14:18:12 UTC (rev 5691)
+++ kernel/branches/2.4.x/exo.kernel.component.common/src/test/java/org/exoplatform/services/mail/test/TestMailService.java 2012-02-23 15:28:00 UTC (rev 5692)
@@ -127,11 +127,6 @@
public void testSendMimeMessage() throws Exception
{
- if (!pingMailServer())
- {
- fail();
- }
-
MimeMessage message = new MimeMessage(service.getMailSession());
message.setFrom(new InternetAddress(generateRandomEmailSender()));
message.setRecipients(javax.mail.Message.RecipientType.TO, generateRandomEmailRecipient());
@@ -152,11 +147,6 @@
public void testSendMessage() throws Exception
{
- if (!pingMailServer())
- {
- fail();
- }
-
Message message = new Message();
message.setFrom(generateRandomEmailSender());
message.setTo(generateRandomEmailRecipient());
@@ -181,11 +171,6 @@
public void testSendSimplMessage() throws Exception
{
- if (!pingMailServer())
- {
- fail();
- }
-
cleanEmailMessages();
assertEquals("SMTP server should be now empty", 0, mailServer.getReceivedEmailSize());
assertFalse(isEmailMessageSent(MAIL_SUBJECT));
@@ -203,11 +188,6 @@
*/
public void testSendSimpleMessageAsynchExceptionCause() throws Exception
{
- if (!pingMailServer())
- {
- fail();
- }
-
Future<Boolean> future =
service.sendMessageInFuture("!@#$%^&*()", generateRandomEmailSender(), MAIL_SUBJECT, MAIL_CONTENTS);
@@ -231,11 +211,6 @@
*/
public void testSendSimpleMessageAsynch() throws Exception
{
- if (!pingMailServer())
- {
- fail();
- }
-
@SuppressWarnings("unchecked")
Future<Boolean>[] futures = new Future[THREAD_NUMBER];
@@ -268,11 +243,6 @@
*/
public void testSendMimeMessageAsynchExceptionCause() throws Exception
{
- if (!pingMailServer())
- {
- fail();
- }
-
Flags flags = new Flags();
flags.add(Flags.Flag.RECENT);
@@ -308,11 +278,6 @@
*/
public void testSendMimeMessageAsynch() throws Exception
{
- if (!pingMailServer())
- {
- fail();
- }
-
@SuppressWarnings("unchecked")
Future<Boolean>[] futures = new Future[THREAD_NUMBER];
MimeMessage message;
@@ -354,11 +319,6 @@
*/
public void testSendMessageAsynchExceptionCause() throws Exception
{
- if (!pingMailServer())
- {
- fail();
- }
-
Attachment attachment = new Attachment();
attachment.setInputStream(new ByteArrayInputStream(ATTACHMENT.getBytes()));
attachment.setMimeType(TEXT_PLAIN);
@@ -394,11 +354,6 @@
*/
public void testSendMessageInFuture() throws Exception
{
- if (!pingMailServer())
- {
- fail();
- }
-
Message message;
Attachment attachment = new Attachment();
@@ -440,17 +395,6 @@
mailServer.getReceivedEmailSize());
}
- private boolean pingMailServer() throws Exception
- {
- String mailServerName = service.getOutgoingMailServer();
- if (netService.ping(mailServerName, SMTP_PORT) < 0)
- {
- System.out.println("======>MailServer:" + mailServerName + " and on port:" + SMTP_PORT + " is not connected");
- return false;
- }
- return true;
- }
-
/**
* Utility method to clean mail server.
* Removes all stored messages one by one.
Modified: kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml
===================================================================
--- kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2012-02-22 14:18:12 UTC (rev 5691)
+++ kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.infinispan.v5/pom.xml 2012-02-23 15:28:00 UTC (rev 5692)
@@ -36,6 +36,22 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.container</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.tool</groupId>
+ <artifactId>exo.tool.framework.junit</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -73,7 +89,7 @@
<id>prepare-test-policy</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <target>
<echo>Creating Access Policy for tests</echo>
<makeurl file="${settings.localRepository}" property="localRepositoryURL" />
<makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -88,7 +104,7 @@
<filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
</filterset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml
===================================================================
--- kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2012-02-22 14:18:12 UTC (rev 5691)
+++ kernel/branches/2.4.x/exo.kernel.component.ext.cache.impl.jboss.v3/pom.xml 2012-02-23 15:28:00 UTC (rev 5692)
@@ -61,6 +61,10 @@
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
</dependency>
+ <dependency>
+ <groupId>picocontainer</groupId>
+ <artifactId>picocontainer</artifactId>
+ </dependency>
</dependencies>
<build>
<plugins>
@@ -99,7 +103,7 @@
<id>prepare-test-policy</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <target>
<echo>Creating Access Policy for tests</echo>
<makeurl file="${settings.localRepository}" property="localRepositoryURL" />
<makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -114,7 +118,7 @@
<filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
</filterset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: kernel/branches/2.4.x/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml
===================================================================
--- kernel/branches/2.4.x/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml 2012-02-22 14:18:12 UTC (rev 5691)
+++ kernel/branches/2.4.x/exo.kernel.component.ext.rpc.impl.jgroups.v3/pom.xml 2012-02-23 15:28:00 UTC (rev 5692)
@@ -38,6 +38,10 @@
<artifactId>exo.kernel.component.common</artifactId>
</dependency>
<dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.container</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.jgroups</groupId>
<artifactId>jgroups</artifactId>
<version>3.0.0.Final</version>
@@ -45,6 +49,10 @@
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.tool</groupId>
+ <artifactId>exo.tool.framework.junit</artifactId>
</dependency>
</dependencies>
<build>
@@ -80,7 +88,7 @@
<id>prepare-test-policy</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <target>
<echo>Creating Access Policy for tests</echo>
<makeurl file="${settings.localRepository}" property="localRepositoryURL" />
<makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -95,7 +103,7 @@
<filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
</filterset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: kernel/branches/2.4.x/exo.kernel.container/pom.xml
===================================================================
--- kernel/branches/2.4.x/exo.kernel.container/pom.xml 2012-02-22 14:18:12 UTC (rev 5691)
+++ kernel/branches/2.4.x/exo.kernel.container/pom.xml 2012-02-23 15:28:00 UTC (rev 5692)
@@ -56,25 +56,6 @@
</exclusion>
</exclusions>
</dependency>
- <dependency>
- <groupId>org.jibx</groupId>
- <artifactId>jibx-bind</artifactId>
- <exclusions>
- <exclusion>
- <groupId>org.codehaus.woodstox</groupId>
- <artifactId>wstx-asl</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.jibx</groupId>
- <artifactId>jibx-extras</artifactId>
- </dependency>
- <dependency>
- <groupId>xpp3</groupId>
- <artifactId>xpp3</artifactId>
- <version>1.1.3.4.O</version>
- </dependency>
</dependencies>
<build>
<plugins>
@@ -109,7 +90,7 @@
<id>prepare-test-policy</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <target>
<echo>Creating Access Policy for tests</echo>
<makeurl file="${settings.localRepository}" property="localRepositoryURL" />
<makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -124,7 +105,7 @@
<filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
</filterset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml
===================================================================
--- kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2012-02-22 14:18:12 UTC (rev 5691)
+++ kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int/pom.xml 2012-02-23 15:28:00 UTC (rev 5692)
@@ -36,10 +36,6 @@
<artifactId>jboss-kernel</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-aop-mc-int</artifactId>
- </dependency>
- <dependency>
<groupId>org.jboss.mc-int</groupId>
<artifactId>jboss-mc-int-common</artifactId>
</dependency>
@@ -48,12 +44,22 @@
<artifactId>jboss-mc-int-servlet</artifactId>
</dependency>
<dependency>
- <groupId>org.jboss.cl</groupId>
- <artifactId>jboss-classloader</artifactId>
- </dependency>
- <dependency>
<groupId>org.exoplatform.kernel</groupId>
<artifactId>exo.kernel.mc-kernel-extras</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jbossxb</artifactId>
+ <version>2.0.1.GA</version>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <version>2.0.2.GA</version>
+ </dependency>
</dependencies>
</project>
Modified: kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml
===================================================================
--- kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2012-02-22 14:18:12 UTC (rev 5691)
+++ kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-demo/pom.xml 2012-02-23 15:28:00 UTC (rev 5692)
@@ -31,6 +31,14 @@
<artifactId>jta</artifactId>
<version>1.0.1B</version>
</dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.commons</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml
===================================================================
--- kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2012-02-22 14:18:12 UTC (rev 5691)
+++ kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-int-tests/pom.xml 2012-02-23 15:28:00 UTC (rev 5692)
@@ -32,6 +32,26 @@
<groupId>org.exoplatform.kernel</groupId>
<artifactId>exo.kernel.mc-int-demo</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.exoplatform.kernel</groupId>
+ <artifactId>exo.kernel.commons</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>javax.transaction</groupId>
+ <artifactId>jta</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ </dependency>
</dependencies>
<build>
@@ -66,7 +86,7 @@
<id>prepare-test-policy</id>
<phase>process-test-resources</phase>
<configuration>
- <tasks>
+ <target>
<echo>Creating Access Policy for tests</echo>
<makeurl file="${settings.localRepository}" property="localRepositoryURL" />
<makeurl file="${project.build.outputDirectory}" property="outputDirectoryURL" />
@@ -81,7 +101,7 @@
<filter token="TEST_CLASSES" value="${testOutputDirectoryURL}" />
</filterset>
</copy>
- </tasks>
+ </target>
</configuration>
<goals>
<goal>run</goal>
Modified: kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml
===================================================================
--- kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2012-02-22 14:18:12 UTC (rev 5691)
+++ kernel/branches/2.4.x/exo.kernel.mc-integration/exo.kernel.mc-kernel-extras/pom.xml 2012-02-23 15:28:00 UTC (rev 5692)
@@ -16,8 +16,12 @@
<dependencies>
<dependency>
- <groupId>org.jboss.microcontainer</groupId>
- <artifactId>jboss-kernel</artifactId>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
</dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ </dependency>
</dependencies>
</project>
Modified: kernel/branches/2.4.x/pom.xml
===================================================================
--- kernel/branches/2.4.x/pom.xml 2012-02-22 14:18:12 UTC (rev 5691)
+++ kernel/branches/2.4.x/pom.xml 2012-02-23 15:28:00 UTC (rev 5692)
@@ -133,12 +133,6 @@
<scope>test</scope>
</dependency>
<dependency>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- <version>1.2.16</version>
- <scope>test</scope>
- </dependency>
- <dependency>
<groupId>xml-apis</groupId>
<artifactId>xml-apis</artifactId>
<version>1.0.b2</version>
@@ -152,10 +146,6 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</exclusion>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
</exclusions>
</dependency>
<dependency>
More information about the exo-jcr-commits
mailing list