You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@syncope.apache.org by il...@apache.org on 2016/03/25 15:03:48 UTC
syncope git commit: [SYNCOPE-810] Added all profile for core and
console + ability to run embedded from enduser with core + console / getting
started updated
Repository: syncope
Updated Branches:
refs/heads/master e913cac10 -> 123bbb83e
[SYNCOPE-810] Added all profile for core and console + ability to run embedded from enduser with core + console / getting started updated
Project: http://git-wip-us.apache.org/repos/asf/syncope/repo
Commit: http://git-wip-us.apache.org/repos/asf/syncope/commit/123bbb83
Tree: http://git-wip-us.apache.org/repos/asf/syncope/tree/123bbb83
Diff: http://git-wip-us.apache.org/repos/asf/syncope/diff/123bbb83
Branch: refs/heads/master
Commit: 123bbb83e2d1c55f2d0b8cd9b0c566c00c75e243
Parents: e913cac
Author: Francesco Chicchiriccò <il...@apache.org>
Authored: Fri Mar 25 15:03:37 2016 +0100
Committer: Francesco Chicchiriccò <il...@apache.org>
Committed: Fri Mar 25 15:03:37 2016 +0100
----------------------------------------------------------------------
archetype/pom.xml | 12 ++-
.../META-INF/maven/archetype-metadata.xml | 8 +-
.../archetype-resources/console/pom.xml | 14 ++-
.../resources/archetype-resources/core/pom.xml | 97 ++++++++++++++++++--
.../archetype-resources/enduser/pom.xml | 8 +-
src/main/asciidoc/commondocs/debpackages.adoc | 5 +-
src/main/asciidoc/commondocs/maven.adoc | 5 +-
src/main/asciidoc/obtain.adoc | 16 +++-
8 files changed, 140 insertions(+), 25 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/syncope/blob/123bbb83/archetype/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/pom.xml b/archetype/pom.xml
index b295c81..57c6b73 100644
--- a/archetype/pom.xml
+++ b/archetype/pom.xml
@@ -169,10 +169,7 @@ under the License.
</resource>
<resource>
<directory>../fit/core-reference/src/main/resources/all</directory>
- <targetPath>${project.build.outputDirectory}/archetype-resources/core/src/main/resources</targetPath>
- <includes>
- <include>workflow.properties</include>
- </includes>
+ <targetPath>${project.build.outputDirectory}/archetype-resources/core/src/main/resources/all</targetPath>
</resource>
<resource>
<directory>../fit/core-reference/src/test/resources/scriptedsql</directory>
@@ -196,6 +193,13 @@ under the License.
<directory>../fit/core-reference/src/main/webapp/WEB-INF</directory>
<targetPath>${project.build.outputDirectory}/archetype-resources/core/src/main/webapp/WEB-INF</targetPath>
</resource>
+ <resource>
+ <directory>../fit/core-reference/src/test/resources</directory>
+ <targetPath>${project.build.outputDirectory}/archetype-resources/core/src/test/resources</targetPath>
+ <includes>
+ <include>addActivitiToContent.xsl</include>
+ </includes>
+ </resource>
<resource>
<directory>../client/console/src/main/resources</directory>
http://git-wip-us.apache.org/repos/asf/syncope/blob/123bbb83/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
----------------------------------------------------------------------
diff --git a/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml b/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
index fc39cb5..7060a73 100644
--- a/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
+++ b/archetype/src/main/resources/META-INF/maven/archetype-metadata.xml
@@ -26,7 +26,7 @@ under the License.
</requiredProperties>
<modules>
- <module id="common" dir="common" name="common">
+ <module id="syncope-common" dir="common" name="syncope-common">
<fileSets>
<fileSet filtered="false" encoding="UTF-8">
<directory>src/main/resources</directory>
@@ -36,7 +36,7 @@ under the License.
</fileSet>
</fileSets>
</module>
- <module id="core" dir="core" name="core">
+ <module id="syncope-core" dir="core" name="syncope-core">
<fileSets>
<fileSet filtered="false" encoding="UTF-8">
<directory>src/main/resources</directory>
@@ -49,7 +49,7 @@ under the License.
</fileSet>
</fileSets>
</module>
- <module id="console" dir="console" name="console">
+ <module id="syncope-console" dir="console" name="syncope-console">
<fileSets>
<fileSet filtered="false" encoding="UTF-8">
<directory>src/main/resources</directory>
@@ -62,7 +62,7 @@ under the License.
</fileSet>
</fileSets>
</module>
- <module id="enduser" dir="enduser" name="enduser">
+ <module id="syncope-enduser" dir="enduser" name="syncope-enduser">
<fileSets>
<fileSet filtered="false" encoding="UTF-8">
<directory>src/main/resources</directory>
http://git-wip-us.apache.org/repos/asf/syncope/blob/123bbb83/archetype/src/main/resources/archetype-resources/console/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/src/main/resources/archetype-resources/console/pom.xml b/archetype/src/main/resources/archetype-resources/console/pom.xml
index 13afb6e..5913a03 100644
--- a/archetype/src/main/resources/archetype-resources/console/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/console/pom.xml
@@ -49,7 +49,7 @@ under the License.
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>common</artifactId>
+ <artifactId>syncope-common</artifactId>
<version>${project.version}</version>
</dependency>
@@ -316,5 +316,17 @@ ORYX.Editor.createByUrl = function(modelUrl){"/>
</plugins>
</build>
</profile>
+
+ <profile>
+ <id>all</id>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.syncope.ext.camel</groupId>
+ <artifactId>syncope-ext-camel-client-console</artifactId>
+ <version>${syncope.version}</version>
+ </dependency>
+ </dependencies>
+ </profile>
</profiles>
</project>
http://git-wip-us.apache.org/repos/asf/syncope/blob/123bbb83/archetype/src/main/resources/archetype-resources/core/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/src/main/resources/archetype-resources/core/pom.xml b/archetype/src/main/resources/archetype-resources/core/pom.xml
index e2303cf..62558a1 100644
--- a/archetype/src/main/resources/archetype-resources/core/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/core/pom.xml
@@ -48,7 +48,7 @@ under the License.
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>common</artifactId>
+ <artifactId>syncope-common</artifactId>
<version>${project.version}</version>
</dependency>
@@ -64,12 +64,7 @@ under the License.
<groupId>org.apache.syncope.core</groupId>
<artifactId>syncope-core-persistence-jpa</artifactId>
</dependency>
-
- <dependency>
- <groupId>org.apache.syncope.core</groupId>
- <artifactId>syncope-core-workflow-activiti</artifactId>
- </dependency>
-
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
@@ -149,4 +144,92 @@ under the License.
</testResources>
</build>
+ <profiles>
+ <profile>
+ <id>all</id>
+
+ <dependencies>
+ <dependency>
+ <groupId>org.apache.syncope.core</groupId>
+ <artifactId>syncope-core-workflow-activiti</artifactId>
+ <version>${syncope.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.syncope.ext.camel</groupId>
+ <artifactId>syncope-ext-camel-rest-cxf</artifactId>
+ <version>${syncope.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.syncope.ext.camel</groupId>
+ <artifactId>syncope-ext-camel-persistence-jpa</artifactId>
+ <version>${syncope.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.syncope.ext.camel</groupId>
+ <artifactId>syncope-ext-camel-provisioning</artifactId>
+ <version>${syncope.version}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.syncope.ext</groupId>
+ <artifactId>syncope-ext-swagger-ui</artifactId>
+ <version>${syncope.version}</version>
+ </dependency>
+ </dependencies>
+
+ <build>
+ <plugins>
+ <!-- Adds Activiti test content -->
+ <plugin>
+ <groupId>org.codehaus.mojo</groupId>
+ <artifactId>xml-maven-plugin</artifactId>
+ <inherited>true</inherited>
+ <executions>
+ <execution>
+ <phase>prepare-package</phase>
+ <goals>
+ <goal>transform</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <transformationSets>
+ <transformationSet>
+ <dir>${project.build.directory}/test-classes</dir>
+ <includes>
+ <include>domains/MasterContent.xml</include>
+ </includes>
+ <outputDir>${project.build.directory}/classes</outputDir>
+ <stylesheet>${basedir}/src/test/resources/addActivitiToContent.xsl</stylesheet>
+ <outputProperties>
+ <outputProperty>
+ <name>indent</name>
+ <value>yes</value>
+ </outputProperty>
+ </outputProperties>
+ </transformationSet>
+ </transformationSets>
+ </configuration>
+ </plugin>
+ </plugins>
+
+ <resources>
+ <resource>
+ <directory>src/main/resources</directory>
+ <filtering>true</filtering>
+ <excludes>
+ <exclude>workflow.properties</exclude>
+ <exclude>provisioning.properties</exclude>
+ </excludes>
+ </resource>
+ <resource>
+ <directory>src/main/resources/all</directory>
+ <filtering>true</filtering>
+ </resource>
+ </resources>
+ </build>
+ </profile>
+ </profiles>
+
</project>
http://git-wip-us.apache.org/repos/asf/syncope/blob/123bbb83/archetype/src/main/resources/archetype-resources/enduser/pom.xml
----------------------------------------------------------------------
diff --git a/archetype/src/main/resources/archetype-resources/enduser/pom.xml b/archetype/src/main/resources/archetype-resources/enduser/pom.xml
index 9ded846..396239e 100644
--- a/archetype/src/main/resources/archetype-resources/enduser/pom.xml
+++ b/archetype/src/main/resources/archetype-resources/enduser/pom.xml
@@ -49,7 +49,7 @@ under the License.
<dependency>
<groupId>${groupId}</groupId>
- <artifactId>common</artifactId>
+ <artifactId>syncope-common</artifactId>
<version>${project.version}</version>
</dependency>
@@ -220,6 +220,12 @@ under the License.
</properties>
</deployable>
<deployable>
+ <location>../console/target/syncope-console</location>
+ <properties>
+ <context>syncope-console</context>
+ </properties>
+ </deployable>
+ <deployable>
<location>${project.build.directory}/${project.build.finalName}</location>
<properties>
<context>syncope-enduser</context>
http://git-wip-us.apache.org/repos/asf/syncope/blob/123bbb83/src/main/asciidoc/commondocs/debpackages.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/commondocs/debpackages.adoc b/src/main/asciidoc/commondocs/debpackages.adoc
index a5c2642..6bd8441 100644
--- a/src/main/asciidoc/commondocs/debpackages.adoc
+++ b/src/main/asciidoc/commondocs/debpackages.adoc
@@ -68,7 +68,7 @@ Install::
[source,bash]
sudo service tomcat8 stop
+
-. Install Apache Syncope core and console via the downloaded packages
+. Install Apache Syncope core, console and enduser via the downloaded packages
+
[source,bash]
sudo dpkg -i apache-syncope-*.deb
@@ -99,4 +99,7 @@ CAUTION: The following assumes that Apache Tomcat is reachable on host `host.dom
| Administration console
| http://host.domain:port/syncope-console/ +
+| End-user UI
+| http://localhost:9080/syncope-enduser/
+
|===
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/syncope/blob/123bbb83/src/main/asciidoc/commondocs/maven.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/commondocs/maven.adoc b/src/main/asciidoc/commondocs/maven.adoc
index 1bcf252..d588f1f 100644
--- a/src/main/asciidoc/commondocs/maven.adoc
+++ b/src/main/asciidoc/commondocs/maven.adoc
@@ -104,17 +104,18 @@ anonymousKey::
Provide any pseudo-random string here that will be used as an authentication key for anonymous requests.
Maven will create a project for you (in a newly created directory named after the value of the `artifactId` property
-specified above) containing three modules: `common`, `core` and `console`.
+specified above) containing four modules: `common`, `core`, `console` and `enduser`.
You are now able to perform the first build via
[source,bash]
mvn clean install
-After downloading all of the needed dependencies, two WAR files will be produced:
+After downloading all of the needed dependencies, three WAR files will be produced:
. `core/target/syncope.war`
. `console/target/syncope-console.war`
+. `enduser/target/syncope-enduser.war`
If no failures are encountered, your basic Apache Syncope project is now ready to go.
http://git-wip-us.apache.org/repos/asf/syncope/blob/123bbb83/src/main/asciidoc/obtain.adoc
----------------------------------------------------------------------
diff --git a/src/main/asciidoc/obtain.adoc b/src/main/asciidoc/obtain.adoc
index ba18436..fc50ec4 100644
--- a/src/main/asciidoc/obtain.adoc
+++ b/src/main/asciidoc/obtain.adoc
@@ -28,7 +28,7 @@ Tomcat-based environment that can be easily grabbed and put at work on any moder
[CAUTION]
.Target Audience
-First approach, especially with administration console; does not require technical skills. +
+First approach, especially with administration console and end-user; does not require technical skills. +
*Not meant for any production environment.*
Getting ready in a few easy steps:
@@ -104,6 +104,9 @@ CAUTION: The following assumes that the Java EE container is reachable on host `
| http://localhost:9080/syncope-console/ +
Credentials: `admin` / `password`
+| End-user UI
+| http://localhost:9080/syncope-enduser/
+
|===
include::commondocs/maven.adoc[]
@@ -122,9 +125,9 @@ made are lost.
From the top-level directory of your project, execute:
[source,bash]
-mvn clean install
+mvn -P all clean install
-then, from the `console` subdirectory, execute:
+then, from the `enduser` subdirectory, execute:
[source,bash]
mvn -P embedded
@@ -135,10 +138,10 @@ mvn -P embedded
|===
| Log files
-| Available under `core/target/log` and `console/target/log`
+| Available under `core/target/log`, `console/target/log` and `enduser/target/log`
| ConnId bundles
-| Available under `console/target/bundles`
+| Available under `core/target/bundles`
| Complete REST API reference
| http://localhost:9080/syncope/index.html
@@ -150,6 +153,9 @@ mvn -P embedded
| http://localhost:9080/syncope-console/ +
Credentials: `admin` / `password`
+| End-user UI
+| http://localhost:9080/syncope-enduser/
+
| Internal storage
| A SQL web interface is available at http://localhost:9080/syncope/db.jsp +
+