syncope-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ilgro...@apache.org
Subject [1/3] syncope git commit: [SYNCOPE-620] deb
Date Thu, 12 Feb 2015 17:17:39 GMT
Repository: syncope
Updated Branches:
  refs/heads/2_0_X 33f270a66 -> 9cbd0d0e8


http://git-wip-us.apache.org/repos/asf/syncope/blob/9cbd0d0e/syncope620/deb/pom.xml
----------------------------------------------------------------------
diff --git a/syncope620/deb/pom.xml b/syncope620/deb/pom.xml
new file mode 100644
index 0000000..9ebf12b
--- /dev/null
+++ b/syncope620/deb/pom.xml
@@ -0,0 +1,68 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+
+  <modelVersion>4.0.0</modelVersion>
+
+  <parent>
+    <groupId>org.apache.syncope</groupId>
+    <artifactId>syncope</artifactId>
+    <version>2.0.0-SNAPSHOT</version>
+  </parent>
+
+  <name>Apache Syncope Deb</name>
+  <description>Apache Syncope Deb</description>
+  <groupId>org.apache.syncope</groupId>
+  <artifactId>syncope-deb</artifactId>
+  <packaging>pom</packaging>
+
+  <properties>
+    <debian.dependencies>tomcat8</debian.dependencies>
+
+    <conf.directory>/etc/apache-syncope</conf.directory>
+    <bundles.directory>/var/lib/apache-syncope/bundles</bundles.directory>
+    <connid.location>file:${bundles.directory}/</connid.location>
+    <log.directory>/var/log/apache-syncope</log.directory>
+  </properties>
+
+  <profiles>
+    <profile>
+      <id>apache-release</id>
+
+      <build>
+        <plugins>
+          <plugin>
+            <groupId>org.apache.maven.plugins</groupId>
+            <artifactId>maven-deploy-plugin</artifactId>
+            <configuration>
+              <skip>true</skip>
+            </configuration>
+          </plugin>
+        </plugins>
+      </build>
+    </profile>
+  </profiles>
+
+  <modules>
+    <module>core</module>
+    <module>console</module>
+  </modules>
+
+</project>

http://git-wip-us.apache.org/repos/asf/syncope/blob/9cbd0d0e/syncope620/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/init/CamelRouteLoader.java
----------------------------------------------------------------------
diff --git a/syncope620/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/init/CamelRouteLoader.java
b/syncope620/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/init/CamelRouteLoader.java
index a738012..eaae724 100644
--- a/syncope620/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/init/CamelRouteLoader.java
+++ b/syncope620/ext/camel/logic/src/main/java/org/apache/syncope/core/logic/init/CamelRouteLoader.java
@@ -128,7 +128,7 @@ public class CamelRouteLoader implements SyncopeLoader {
                     route.setContent(routeContent);
 
                     jdbcTemplate.update(query, new Object[] { routeId, subjectType.name(),
routeContent });
-                    LOG.debug("Route {} successfully loaded", routeId);
+                    LOG.info("Route successfully loaded: {}", routeId);
                 }
             } catch (DataAccessException e) {
                 LOG.error("While trying to store queries {}", e);
@@ -151,9 +151,9 @@ public class CamelRouteLoader implements SyncopeLoader {
         }
 
         if (existingData) {
-            LOG.info("Data found in the database, leaving untouched");
+            LOG.info("Camel route entitlements found in the database, leaving untouched");
         } else {
-            LOG.info("Empty database found, loading default content");
+            LOG.info("No Camel route entitlements found in the database, loading");
 
             try {
                 jdbcTemplate.update("INSERT INTO Entitlement(NAME) VALUES('ROUTE_READ')");

http://git-wip-us.apache.org/repos/asf/syncope/blob/9cbd0d0e/syncope620/ext/camel/provisioning-camel/src/main/resources/provisioningCamelContext.xml
----------------------------------------------------------------------
diff --git a/syncope620/ext/camel/provisioning-camel/src/main/resources/provisioningCamelContext.xml
b/syncope620/ext/camel/provisioning-camel/src/main/resources/provisioningCamelContext.xml
index 59c2543..cb37941 100644
--- a/syncope620/ext/camel/provisioning-camel/src/main/resources/provisioningCamelContext.xml
+++ b/syncope620/ext/camel/provisioning-camel/src/main/resources/provisioningCamelContext.xml
@@ -26,11 +26,11 @@ under the License.
                            http://www.springframework.org/schema/context/spring-context.xsd">
 
   <bean id="userRoutes" class="org.apache.syncope.core.misc.spring.ResourceWithFallbackLoader">
-    <property name="primary" value="file:${camel.directory}/userWorkflow.bpmn20.xml"/>
+    <property name="primary" value="file:${camel.directory}/userRoutes.xml"/>
     <property name="fallback" value="classpath:userRoutes.xml"/>
   </bean>
   <bean id="roleRoutes" class="org.apache.syncope.core.misc.spring.ResourceWithFallbackLoader">
-    <property name="primary" value="file:${camel.directory}/userWorkflow.bpmn20.xml"/>
+    <property name="primary" value="file:${camel.directory}/roleRoutes.xml"/>
     <property name="fallback" value="classpath:roleRoutes.xml"/>
   </bean>
     

http://git-wip-us.apache.org/repos/asf/syncope/blob/9cbd0d0e/syncope620/fit/core-reference/pom.xml
----------------------------------------------------------------------
diff --git a/syncope620/fit/core-reference/pom.xml b/syncope620/fit/core-reference/pom.xml
index e57036f..93ee973 100644
--- a/syncope620/fit/core-reference/pom.xml
+++ b/syncope620/fit/core-reference/pom.xml
@@ -124,7 +124,6 @@ under the License.
     <dependency>
       <groupId>net.tirasa.connid.bundles.soap</groupId>
       <artifactId>wssample</artifactId>
-      <version>${connid.soap.version}</version>
       <type>war</type>
       <scope>test</scope>
     </dependency>

http://git-wip-us.apache.org/repos/asf/syncope/blob/9cbd0d0e/syncope620/pom.xml
----------------------------------------------------------------------
diff --git a/syncope620/pom.xml b/syncope620/pom.xml
index 184ba60..9ca00b9 100644
--- a/syncope620/pom.xml
+++ b/syncope620/pom.xml
@@ -1155,6 +1155,12 @@ under the License.
             <targetJdk>${targetJdk}</targetJdk>
           </configuration>
         </plugin>
+        
+        <plugin>
+          <groupId>org.vafer</groupId>
+          <artifactId>jdeb</artifactId>
+          <version>1.3</version>
+        </plugin>
       </plugins>
     </pluginManagement>
 
@@ -1424,6 +1430,8 @@ under the License.
     <module>fit</module>
     <module>ext</module>
     <module>archetype</module>
+    <module>standalone</module>
+    <module>deb</module>
   </modules>
 
 </project>


Mime
View raw message