syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From fmarte...@apache.org
Subject svn commit: r1405822 - in /incubator/syncope/trunk: archetype/src/main/resources/archetype-resources/core/pom.xml console/pom.xml core/pom.xml core/src/main/java/org/apache/syncope/core/init/LoggerLoader.java pom.xml
Date Mon, 05 Nov 2012 15:07:23 GMT
Author: fmartelli
Date: Mon Nov  5 15:07:23 2012
New Revision: 1405822

URL: http://svn.apache.org/viewvc?rev=1405822&view=rev
Log:
merge with the branch 1.0.X

Modified:
    incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml
    incubator/syncope/trunk/console/pom.xml
    incubator/syncope/trunk/core/pom.xml
    incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/LoggerLoader.java
    incubator/syncope/trunk/pom.xml

Modified: incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml?rev=1405822&r1=1405821&r2=1405822&view=diff
==============================================================================
--- incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml
(original)
+++ incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml
Mon Nov  5 15:07:23 2012
@@ -72,33 +72,6 @@ under the License.
       <artifactId>spring-security-config</artifactId>
     </dependency>
 
-    <dependency>
-      <groupId>org.apache.geronimo.specs</groupId> 
-      <artifactId>geronimo-jpa_2.0_spec</artifactId> 
-    </dependency>
-    <dependency>
-      <groupId>org.apache.openjpa</groupId>
-      <artifactId>openjpa-jdbc</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.openjpa</groupId>
-      <artifactId>openjpa-persistence-jdbc</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>javax.validation</groupId>
-      <artifactId>validation-api</artifactId>
-    </dependency>
-    <dependency>
-      <groupId>org.apache.bval</groupId>
-      <artifactId>bval-jsr303</artifactId>
-    </dependency>
-
-    <dependency>
-      <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy-all</artifactId>
-    </dependency>
-
     <!-- TEST -->
     <dependency>
       <groupId>org.apache.syncope</groupId>

Modified: incubator/syncope/trunk/console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/pom.xml?rev=1405822&r1=1405821&r2=1405822&view=diff
==============================================================================
--- incubator/syncope/trunk/console/pom.xml (original)
+++ incubator/syncope/trunk/console/pom.xml Mon Nov  5 15:07:23 2012
@@ -51,18 +51,6 @@ under the License.
       <version>${project.version}</version>
     </dependency>
 
-    <!-- Only needed for running core -->
-    <dependency>
-      <groupId>org.apache.openjpa</groupId>
-      <artifactId>openjpa-all</artifactId>
-      <scope>provided</scope>
-    </dependency>
-    <dependency>
-      <groupId>org.codehaus.groovy</groupId>
-      <artifactId>groovy-all</artifactId>
-      <scope>provided</scope>
-    </dependency>
-
     <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>servlet-api</artifactId>

Modified: incubator/syncope/trunk/core/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/pom.xml?rev=1405822&r1=1405821&r2=1405822&view=diff
==============================================================================
--- incubator/syncope/trunk/core/pom.xml (original)
+++ incubator/syncope/trunk/core/pom.xml Mon Nov  5 15:07:23 2012
@@ -208,40 +208,33 @@ under the License.
 
     <dependency>
       <groupId>org.apache.geronimo.specs</groupId> 
-      <artifactId>geronimo-jpa_2.0_spec</artifactId> 
-      <scope>provided</scope>
+      <artifactId>geronimo-jpa_2.0_spec</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.openjpa</groupId>
-      <artifactId>openjpa-all</artifactId>
-      <scope>provided</scope>
+      <artifactId>openjpa</artifactId>
     </dependency>
     <dependency>
       <groupId>org.apache.openjpa</groupId>
       <artifactId>openjpa-jdbc</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.openjpa</groupId>
       <artifactId>openjpa-persistence-jdbc</artifactId>
-      <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>javax.validation</groupId>
       <artifactId>validation-api</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.apache.bval</groupId>
       <artifactId>bval-jsr303</artifactId>
-      <scope>provided</scope>
     </dependency>
 
     <dependency>
       <groupId>org.codehaus.groovy</groupId>
       <artifactId>groovy-all</artifactId>
-      <scope>provided</scope>
     </dependency>
 
     <dependency>
@@ -259,7 +252,6 @@ under the License.
     <dependency>
       <groupId>commons-logging</groupId>
       <artifactId>commons-logging</artifactId>
-      <scope>provided</scope>
     </dependency>
     <dependency>
       <groupId>org.slf4j</groupId>
@@ -492,16 +484,6 @@ under the License.
                 <groupId>${jdbcdriver.groupId}</groupId>
                 <artifactId>${jdbcdriver.artifactId}</artifactId>
               </dependency>
-              
-              <dependency>
-                <groupId>org.apache.openjpa</groupId>
-                <artifactId>openjpa-all</artifactId>
-              </dependency>
-
-              <dependency>
-                <groupId>org.codehaus.groovy</groupId>
-                <artifactId>groovy-all</artifactId>
-              </dependency>
             </dependencies>            
           </container>
           <configuration>
@@ -1031,16 +1013,6 @@ under the License.
       
       <dependencies>
         <dependency>
-          <groupId>org.apache.openjpa</groupId>
-          <artifactId>openjpa-all</artifactId>
-        </dependency>
-
-        <dependency>
-          <groupId>org.codehaus.groovy</groupId>
-          <artifactId>groovy-all</artifactId>
-        </dependency>
-
-        <dependency>
           <groupId>com.h2database</groupId>
           <artifactId>h2</artifactId>
         </dependency>
@@ -1085,16 +1057,6 @@ under the License.
       
       <dependencies>
         <dependency>
-          <groupId>org.apache.openjpa</groupId>
-          <artifactId>openjpa-all</artifactId>
-        </dependency>
-
-        <dependency>
-          <groupId>org.codehaus.groovy</groupId>
-          <artifactId>groovy-all</artifactId>
-        </dependency>
-
-        <dependency>
           <groupId>com.h2database</groupId>
           <artifactId>h2</artifactId>
         </dependency>
@@ -1174,16 +1136,6 @@ under the License.
       
       <dependencies>
         <dependency>
-          <groupId>org.apache.openjpa</groupId>
-          <artifactId>openjpa-all</artifactId>
-        </dependency>
-
-        <dependency>
-          <groupId>org.codehaus.groovy</groupId>
-          <artifactId>groovy-all</artifactId>
-        </dependency>
-
-        <dependency>
           <groupId>com.h2database</groupId>
           <artifactId>h2</artifactId>
         </dependency>

Modified: incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/LoggerLoader.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/LoggerLoader.java?rev=1405822&r1=1405821&r2=1405822&view=diff
==============================================================================
--- incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/LoggerLoader.java
(original)
+++ incubator/syncope/trunk/core/src/main/java/org/apache/syncope/core/init/LoggerLoader.java
Mon Nov  5 15:07:23 2012
@@ -22,7 +22,6 @@ import ch.qos.logback.classic.Logger;
 import ch.qos.logback.classic.LoggerContext;
 import java.util.HashMap;
 import java.util.Map;
-import org.slf4j.LoggerFactory;
 import org.springframework.beans.factory.annotation.Autowired;
 import org.springframework.stereotype.Component;
 import org.springframework.transaction.annotation.Transactional;
@@ -30,6 +29,8 @@ import org.apache.syncope.core.persisten
 import org.apache.syncope.core.persistence.dao.LoggerDAO;
 import org.apache.syncope.types.SyncopeLoggerLevel;
 import org.apache.syncope.types.SyncopeLoggerType;
+import org.slf4j.ILoggerFactory;
+import org.slf4j.LoggerFactory;
 
 @Component
 public class LoggerLoader {
@@ -48,7 +49,9 @@ public class LoggerLoader {
             loggerLogs.put(syncopeLogger.getName(), syncopeLogger);
         }
 
-        LoggerContext lc = (LoggerContext) LoggerFactory.getILoggerFactory();
+        ILoggerFactory loggerFactory = LoggerFactory.getILoggerFactory();
+
+        LoggerContext lc = (LoggerContext) loggerFactory;
 
         /*
          * Traverse all defined Logback loggers: if there is a matching SyncopeLogger, set
Logback level accordingly,

Modified: incubator/syncope/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/pom.xml?rev=1405822&r1=1405821&r2=1405822&view=diff
==============================================================================
--- incubator/syncope/trunk/pom.xml (original)
+++ incubator/syncope/trunk/pom.xml Mon Nov  5 15:07:23 2012
@@ -214,7 +214,7 @@ under the License.
       </roles>
       <url>http://people.apache.org/~jbonofre/</url>
     </developer>
-	<developer>
+    <developer>
       <id>jbernhardt</id>
       <name>Jan Bernhardt</name>
       <organization>Talend</organization>
@@ -274,7 +274,7 @@ under the License.
     <velocity.version>1.7</velocity.version>
     <quartz.version>2.1.6</quartz.version>
 
-    <openjpa.version>2.2.0</openjpa.version>
+    <openjpa.version>2.2.1</openjpa.version>
     <bval.version>0.5</bval.version>
         
     <cocoon.version>3.0.0-alpha-3</cocoon.version>
@@ -409,9 +409,10 @@ under the License.
         <artifactId>geronimo-jpa_2.0_spec</artifactId> 
         <version>1.1</version> 
       </dependency>
+      
       <dependency>
         <groupId>org.apache.openjpa</groupId>
-        <artifactId>openjpa-all</artifactId>
+        <artifactId>openjpa</artifactId>
         <version>${openjpa.version}</version>
       </dependency>
       <dependency>



Mime
View raw message