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 2012/02/23 17:38:04 UTC

svn commit: r1292848 [1/3] - in /incubator/syncope/trunk: archetype/src/main/resources/archetype-resources/ archetype/src/main/resources/archetype-resources/console/ archetype/src/main/resources/archetype-resources/core/ client/ client/src/main/java/or...

Author: ilgrosso
Date: Thu Feb 23 16:38:01 2012
New Revision: 1292848

URL: http://svn.apache.org/viewvc?rev=1292848&view=rev
Log:
SYNCOPE-4 #resolve

Added:
    incubator/syncope/trunk/client/src/main/java/org/syncope/client/util/XMLSerializer.java   (with props)
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/commons/DateFormatROModel.java
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/commons/HttpResourceStream.java
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/markup/
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/markup/html/
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/markup/html/CrontabContainer.java
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/ExecMessageModalPage.java   (with props)
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/ReportExecResultDownloadModalPage.java   (with props)
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/ReportModalPage.java
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ExecutionRestClient.java
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ReportRestClient.java
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/ajax/form/
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/ajax/form/AbstractAjaxDownloadBehavior.java   (with props)
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ExecMessageModalPage.html   (with props)
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportExecResultDownloadModalPage.html
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportExecResultDownloadModalPage.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportExecResultDownloadModalPage_it.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportModalPage.html
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportModalPage.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ReportModalPage_it.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Reports.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Reports_it.properties
    incubator/syncope/trunk/console/src/main/webapp/img/actions/export.png   (with props)
Removed:
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/TaskExecMessageModalPage.java
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/NotificationTaskModalPage.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/TaskExecMessageModalPage.html
    incubator/syncope/trunk/console/src/main/webapp/img/under-construction.jpg
    incubator/syncope/trunk/core/src/main/java/org/syncope/core/util/XMLSerializer.java
Modified:
    incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
    incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/core/pom.xml
    incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/pom.xml
    incubator/syncope/trunk/client/pom.xml
    incubator/syncope/trunk/client/src/main/java/org/syncope/client/to/ReportTO.java
    incubator/syncope/trunk/client/src/main/java/org/syncope/client/validation/SyncopeClientErrorHandler.java
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/commons/Constants.java
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/commons/SelectOption.java
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/AbstractSchedTaskModalPage.java
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Configuration.java
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/Reports.java
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/TaskModalPage.java
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/pages/panels/SchedTasks.java
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/ConfigurationRestClient.java
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/rest/TaskRestClient.java
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/ActionLink.java
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/ActionLinksPanel.java
    incubator/syncope/trunk/console/src/main/java/org/syncope/console/wicket/markup/html/form/AjaxDropDownChoicePanel.java
    incubator/syncope/trunk/console/src/main/resources/authorizations.xml
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/SyncopeApplication.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/SyncopeApplication_it.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Configuration.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Configuration_it.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ConnectorModalPage.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ConnectorModalPage_it.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/DerivedSchemaModalPage.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/DerivedSchemaModalPage_it.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/DisplayAttributesModalPage.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/DisplayAttributesModalPage_it.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/NotificationTaskModalPage_it.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/PolicyModalPage.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/PolicyModalPage_it.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/PropagationTaskModalPage.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/PropagationTaskModalPage_it.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Reports.html
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ResourceModalPage.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/ResourceModalPage_it.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Resources.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Resources_it.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/RoleModalPage.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/RoleModalPage_it.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SchedTaskModalPage.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SchedTaskModalPage_it.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Schema.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SchemaModalPage.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SchemaModalPage_it.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Schema_it.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SyncTaskModalPage.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/SyncTaskModalPage_it.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Todo.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/Todo_it.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/VirtualSchemaModalPage.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/pages/VirtualSchemaModalPage_it.properties
    incubator/syncope/trunk/console/src/main/resources/org/syncope/console/wicket/markup/html/form/ActionLinksPanel.html
    incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ConnInstance.java
    incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/ExternalResource.java
    incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Notification.java
    incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Policy.java
    incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/PropagationTask.java
    incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/Report.java
    incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/SyncTask.java
    incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/beans/UserRequest.java
    incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/ReportExecDAO.java
    incubator/syncope/trunk/core/src/main/java/org/syncope/core/persistence/dao/impl/ReportExecDAOImpl.java
    incubator/syncope/trunk/core/src/main/java/org/syncope/core/rest/data/ReportDataBinder.java
    incubator/syncope/trunk/core/src/main/java/org/syncope/core/rest/data/TaskDataBinder.java
    incubator/syncope/trunk/core/src/test/java/org/syncope/core/rest/ReportTestITCase.java
    incubator/syncope/trunk/core/src/test/java/org/syncope/core/rest/TaskTestITCase.java
    incubator/syncope/trunk/quality/src/main/resources/org/syncope/checkstyle.xml

Modified: incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml (original)
+++ incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/console/pom.xml Thu Feb 23 16:38:01 2012
@@ -18,251 +18,251 @@ specific language governing permissions 
 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>${groupId}</groupId>

-        <artifactId>${rootArtifactId}</artifactId>

-        <version>${version}</version>

-    </parent>

-

-    <name>Syncope sample project console</name>

-    <groupId>${groupId}</groupId>

-    <artifactId>${artifactId}</artifactId>

-    <packaging>war</packaging>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.wicket</groupId>

-            <artifactId>wicket</artifactId>

-            <type>pom</type>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.wicket</groupId>

-            <artifactId>wicket-extensions</artifactId>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.wicket</groupId>

-            <artifactId>wicket-spring</artifactId>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.syncope</groupId>

-            <artifactId>syncope-client</artifactId>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.syncope</groupId>

-            <artifactId>syncope-console</artifactId>

-            <type>war</type>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.syncope</groupId>

-            <artifactId>syncope-console</artifactId>

-            <classifier>classes</classifier>

-        </dependency>

-

-        <dependency>

-            <groupId>org.springframework</groupId>

-            <artifactId>spring-webmvc</artifactId>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.wicket</groupId>

-            <artifactId>wicket-auth-roles</artifactId>

-            <type>jar</type>

-        </dependency>

-

-        <!-- TEST -->

-        <dependency>

-            <groupId>com.h2database</groupId>

-            <artifactId>h2</artifactId>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.connid.bundles.soap</groupId>

-            <artifactId>org.connid.bundles.soap</artifactId>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.connid.bundles.soap</groupId>

-            <artifactId>wssample</artifactId>

-            <type>war</type>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.connid.bundles.db</groupId>

-            <artifactId>org.connid.bundles.db.table</artifactId>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.connid.bundles</groupId>

-            <artifactId>org.connid.bundles.csvdir</artifactId>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.connid.bundles</groupId>

-            <artifactId>org.connid.bundles.ldap</artifactId>

-            <scope>test</scope>

-        </dependency>

-        

-        <dependency>

-            <groupId>org.apache.syncope</groupId>

-            <artifactId>syncope-build-tools</artifactId>

-            <type>war</type>

-            <scope>test</scope>

-        </dependency>

-        <!-- /TEST -->

-        

-    </dependencies>

-

-    <build>

-        <finalName>syncope-console</finalName>

-

-        <plugins>

-

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-dependency-plugin</artifactId>

-                <inherited>true</inherited>

-                <executions>

-                    <execution>

-                        <id>set-bundles</id>

-                        <phase>process-test-resources</phase>

-                        <goals>

-                            <goal>copy</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-            

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-antrun-plugin</artifactId>

-                <inherited>true</inherited>

-                <executions>

-                    <execution>

-                        <id>explodeSyncopeWAR</id>

-                        <phase>pre-integration-test</phase>

-                        <configuration>

-                            <target>

-                                <unzip src="${basedir}/../core/target/syncope.war" dest="${cargo.run.dir}">

-                                    <patternset>

-                                        <exclude name="**/content.xml" />

-                                        <exclude name="**/persistence.properties" />

-                                        <exclude name="**/security.properties" />

-                                        <exclude name="**/workflow.properties" />

-                                    </patternset>

-                                </unzip>

-                                <copy file="${project.build.directory}/test-classes/db.jsp" todir="${cargo.run.dir}"/>

-                                <copy todir="${cargo.run.dir}/WEB-INF/classes" includeEmptyDirs="false">

-                                    <fileset dir="${project.build.directory}/test-classes"/>

-                                </copy>

-                            </target>

-                        </configuration>

-                        <goals>

-                            <goal>run</goal>

-                        </goals>

-                    </execution>

-                    <execution>

-                        <id>setupCSV</id>

-                        <phase>pre-integration-test</phase>

-                        <configuration>

-                            <target>

-                                <copy file="${project.build.directory}/test-classes/test.csv" todir="${java.io.tmpdir}" overwrite="true"/>

-                            </target>    

-                        </configuration>

-                        <goals>

-                            <goal>run</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-

-            <plugin>

-                <groupId>org.codehaus.cargo</groupId>

-                <artifactId>cargo-maven2-plugin</artifactId>

-                <inherited>true</inherited>

-                <configuration>

-                    <container>

-                        <dependencies>

-                            <dependency>

-                                <groupId>com.h2database</groupId>

-                                <artifactId>h2</artifactId>

-                            </dependency>

-                        </dependencies>

-                    </container>

-                    <configuration>

-                        <type>standalone</type>

-                        <properties>

-                            <cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>

-                            <cargo.jvmargs>-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m</cargo.jvmargs>

-                        </properties>

-                        <deployables>

-                            <deployable>

-                                <location>${cargo.run.dir}</location>

-                                <properties>

-                                    <context>syncope</context>

-                                </properties>

-                            </deployable>

-                            <deployable>

-                                <location>${project.build.directory}/${project.build.finalName}.war</location>

-                                <properties>

-                                    <context>syncope-console</context>

-                                </properties>

-                            </deployable>

-                            <deployable>

-                                <location>${settings.localRepository}/org/syncope/syncope-build-tools/${syncope.version}/syncope-build-tools-${syncope.version}.war</location>

-                                <properties>

-                                    <context>syncope-build-tools</context>

-                                </properties>

-                            </deployable>

-                            <deployable>

-                                <location>${settings.localRepository}/org/connid/bundles/soap/wssample/${connid.soap.version}/wssample-${connid.soap.version}.war</location>

-                                <properties>

-                                    <context>wssample</context>

-                                </properties>

-                            </deployable>

-                        </deployables>

-                    </configuration>

-                </configuration>

-            </plugin>

-            

-        </plugins>

-

-        <resources>

-            <resource>

-                <directory>src/main/resources</directory>

-                <filtering>true</filtering>

-            </resource>

-        </resources>

 

-        <testResources>

-            <testResource>

-                <directory>src/test/resources</directory>

-                <filtering>true</filtering>

-            </testResource>

-            <testResource>

-                <directory>../core/src/test/resources</directory>

-                <filtering>true</filtering>

-            </testResource>

-        </testResources>

-    </build>

-    

-    <profiles>

-        <profile>

-            <id>embedded</id>

-            <properties>

-                <maven.test.skip>true</maven.test.skip>

-            </properties>

-            <build>

-                <defaultGoal>clean verify cargo:run</defaultGoal>    

-            </build>

-        </profile>    

-    </profiles>

-</project>

+<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>${groupId}</groupId>


+        <artifactId>${rootArtifactId}</artifactId>


+        <version>${version}</version>


+    </parent>


+


+    <name>Syncope sample project console</name>


+    <groupId>${groupId}</groupId>


+    <artifactId>${artifactId}</artifactId>


+    <packaging>war</packaging>


+


+    <dependencies>


+


+        <dependency>


+            <groupId>org.apache.wicket</groupId>


+            <artifactId>wicket</artifactId>


+            <type>pom</type>


+        </dependency>


+


+        <dependency>


+            <groupId>org.apache.wicket</groupId>


+            <artifactId>wicket-extensions</artifactId>


+        </dependency>


+


+        <dependency>


+            <groupId>org.apache.wicket</groupId>


+            <artifactId>wicket-spring</artifactId>


+        </dependency>


+


+        <dependency>


+            <groupId>org.apache.syncope</groupId>


+            <artifactId>syncope-client</artifactId>


+        </dependency>


+        <dependency>


+            <groupId>org.apache.syncope</groupId>


+            <artifactId>syncope-console</artifactId>


+            <type>war</type>


+        </dependency>


+        <dependency>


+            <groupId>org.apache.syncope</groupId>


+            <artifactId>syncope-console</artifactId>


+            <classifier>classes</classifier>


+        </dependency>


+


+        <dependency>


+            <groupId>org.springframework</groupId>


+            <artifactId>spring-webmvc</artifactId>


+        </dependency>


+


+        <dependency>


+            <groupId>org.apache.wicket</groupId>


+            <artifactId>wicket-auth-roles</artifactId>


+            <type>jar</type>


+        </dependency>


+


+        <!-- TEST -->


+        <dependency>


+            <groupId>com.h2database</groupId>


+            <artifactId>h2</artifactId>


+            <scope>test</scope>


+        </dependency>


+        <dependency>


+            <groupId>org.connid.bundles.soap</groupId>


+            <artifactId>org.connid.bundles.soap</artifactId>


+            <scope>test</scope>


+        </dependency>


+        <dependency>


+            <groupId>org.connid.bundles.soap</groupId>


+            <artifactId>wssample</artifactId>


+            <type>war</type>


+            <scope>test</scope>


+        </dependency>


+        <dependency>


+            <groupId>org.connid.bundles.db</groupId>


+            <artifactId>org.connid.bundles.db.table</artifactId>


+            <scope>test</scope>


+        </dependency>


+        <dependency>


+            <groupId>org.connid.bundles</groupId>


+            <artifactId>org.connid.bundles.csvdir</artifactId>


+            <scope>test</scope>


+        </dependency>


+        <dependency>


+            <groupId>org.connid.bundles</groupId>


+            <artifactId>org.connid.bundles.ldap</artifactId>


+            <scope>test</scope>


+        </dependency>


+        


+        <dependency>


+            <groupId>org.apache.syncope</groupId>


+            <artifactId>syncope-build-tools</artifactId>


+            <type>war</type>


+            <scope>test</scope>


+        </dependency>


+        <!-- /TEST -->


+        


+    </dependencies>


+


+    <build>


+        <finalName>syncope-console</finalName>


+


+        <plugins>


+


+            <plugin>


+                <groupId>org.apache.maven.plugins</groupId>


+                <artifactId>maven-dependency-plugin</artifactId>


+                <inherited>true</inherited>


+                <executions>


+                    <execution>


+                        <id>set-bundles</id>


+                        <phase>process-test-resources</phase>


+                        <goals>


+                            <goal>copy</goal>


+                        </goals>


+                    </execution>


+                </executions>


+            </plugin>


+            


+            <plugin>


+                <groupId>org.apache.maven.plugins</groupId>


+                <artifactId>maven-antrun-plugin</artifactId>


+                <inherited>true</inherited>


+                <executions>


+                    <execution>


+                        <id>explodeSyncopeWAR</id>


+                        <phase>pre-integration-test</phase>


+                        <configuration>


+                            <target>


+                                <unzip src="${basedir}/../core/target/syncope.war" dest="${cargo.run.dir}">


+                                    <patternset>


+                                        <exclude name="**/content.xml" />


+                                        <exclude name="**/persistence.properties" />


+                                        <exclude name="**/security.properties" />


+                                        <exclude name="**/workflow.properties" />


+                                    </patternset>


+                                </unzip>


+                                <copy file="${project.build.directory}/test-classes/db.jsp" todir="${cargo.run.dir}"/>


+                                <copy todir="${cargo.run.dir}/WEB-INF/classes" includeEmptyDirs="false">


+                                    <fileset dir="${project.build.directory}/test-classes"/>


+                                </copy>


+                            </target>


+                        </configuration>


+                        <goals>


+                            <goal>run</goal>


+                        </goals>


+                    </execution>


+                    <execution>


+                        <id>setupCSV</id>


+                        <phase>pre-integration-test</phase>


+                        <configuration>


+                            <target>


+                                <copy file="${project.build.directory}/test-classes/test.csv" todir="${java.io.tmpdir}" overwrite="true"/>


+                            </target>    


+                        </configuration>


+                        <goals>


+                            <goal>run</goal>


+                        </goals>


+                    </execution>


+                </executions>


+            </plugin>


+


+            <plugin>


+                <groupId>org.codehaus.cargo</groupId>


+                <artifactId>cargo-maven2-plugin</artifactId>


+                <inherited>true</inherited>


+                <configuration>


+                    <container>


+                        <dependencies>


+                            <dependency>


+                                <groupId>com.h2database</groupId>


+                                <artifactId>h2</artifactId>


+                            </dependency>


+                        </dependencies>


+                    </container>


+                    <configuration>


+                        <type>standalone</type>


+                        <properties>


+                            <cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>


+                            <cargo.jvmargs>-Xms512m -Xmx1024m -XX:PermSize=256m -XX:MaxPermSize=512m</cargo.jvmargs>


+                        </properties>


+                        <deployables>


+                            <deployable>


+                                <location>${cargo.run.dir}</location>


+                                <properties>


+                                    <context>syncope</context>


+                                </properties>


+                            </deployable>


+                            <deployable>


+                                <location>${project.build.directory}/${project.build.finalName}.war</location>


+                                <properties>


+                                    <context>syncope-console</context>


+                                </properties>


+                            </deployable>


+                            <deployable>


+                                <location>${settings.localRepository}/org/syncope/syncope-build-tools/${syncope.version}/syncope-build-tools-${syncope.version}.war</location>


+                                <properties>


+                                    <context>syncope-build-tools</context>


+                                </properties>


+                            </deployable>


+                            <deployable>


+                                <location>${settings.localRepository}/org/connid/bundles/soap/wssample/${connid.soap.version}/wssample-${connid.soap.version}.war</location>


+                                <properties>


+                                    <context>wssample</context>


+                                </properties>


+                            </deployable>


+                        </deployables>


+                    </configuration>


+                </configuration>


+            </plugin>


+            


+        </plugins>


+


+        <resources>


+            <resource>


+                <directory>src/main/resources</directory>


+                <filtering>true</filtering>


+            </resource>


+        </resources>


+


+        <testResources>


+            <testResource>


+                <directory>src/test/resources</directory>


+                <filtering>true</filtering>


+            </testResource>


+            <testResource>


+                <directory>../core/src/test/resources</directory>


+                <filtering>true</filtering>


+            </testResource>


+        </testResources>


+    </build>


+    


+    <profiles>


+        <profile>


+            <id>embedded</id>


+            <properties>


+                <maven.test.skip>true</maven.test.skip>


+            </properties>


+            <build>


+                <defaultGoal>clean verify cargo:run</defaultGoal>    


+            </build>


+        </profile>    


+    </profiles>


+</project>



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=1292848&r1=1292847&r2=1292848&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 Thu Feb 23 16:38:01 2012
@@ -18,314 +18,314 @@ specific language governing permissions 
 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>${groupId}</groupId>

-        <artifactId>${rootArtifactId}</artifactId>

-        <version>${version}</version>

-    </parent>

-

-    <name>Syncope sample project core</name>

-    <groupId>${groupId}</groupId>

-    <artifactId>${artifactId}</artifactId>

-    <packaging>war</packaging>

-

-    <dependencies>

-

-        <dependency>

-            <groupId>org.apache.syncope</groupId>

-            <artifactId>syncope-client</artifactId>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.syncope</groupId>

-            <artifactId>syncope-core</artifactId>

-            <type>war</type>

-        </dependency>

-        <dependency>

-            <groupId>org.apache.syncope</groupId>

-            <artifactId>syncope-core</artifactId>

-            <classifier>classes</classifier>

-        </dependency>

-

-        <dependency>

-            <groupId>javax.servlet</groupId>

-            <artifactId>servlet-api</artifactId>

-        </dependency>

-        <dependency>

-            <groupId>javax.servlet.jsp</groupId>

-            <artifactId>jsp-api</artifactId>

-        </dependency>

-        <dependency>

-            <groupId>javax.servlet</groupId>

-            <artifactId>jstl</artifactId>

-        </dependency>

-

-        <dependency>

-            <groupId>org.springframework.security</groupId>

-            <artifactId>spring-security-web</artifactId>

-        </dependency>

-        <dependency>

-            <groupId>org.springframework.security</groupId>

-            <artifactId>spring-security-config</artifactId>

-        </dependency>

-

-        <dependency>

-            <groupId>org.apache.openjpa</groupId>

-            <artifactId>openjpa-all</artifactId>

-        </dependency>

-

-        <dependency>

-            <groupId>org.codehaus.groovy</groupId>

-            <artifactId>groovy-all</artifactId>

-        </dependency>

-

-        <!-- TEST -->

-        <dependency>

-            <groupId>junit</groupId>

-            <artifactId>junit</artifactId>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.springframework</groupId>

-            <artifactId>spring-test</artifactId>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>com.h2database</groupId>

-            <artifactId>h2</artifactId>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.connid.bundles.soap</groupId>

-            <artifactId>org.connid.bundles.soap</artifactId>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.connid.bundles.soap</groupId>

-            <artifactId>wssample</artifactId>

-            <type>war</type>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.connid.bundles.db</groupId>

-            <artifactId>org.connid.bundles.db.table</artifactId>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.connid.bundles</groupId>

-            <artifactId>org.connid.bundles.csvdir</artifactId>

-            <scope>test</scope>

-        </dependency>

-        <dependency>

-            <groupId>org.connid.bundles</groupId>

-            <artifactId>org.connid.bundles.ldap</artifactId>

-            <scope>test</scope>

-        </dependency>

-            

-        <dependency>

-            <groupId>org.apache.syncope</groupId>

-            <artifactId>syncope-build-tools</artifactId>

-            <type>war</type>

-            <scope>test</scope>

-        </dependency>

-        <!-- /TEST -->

-

-    </dependencies>

-

-    <build>

-        <finalName>syncope</finalName>

-

-        <plugins>

-

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-dependency-plugin</artifactId>

-                <inherited>true</inherited>

-                <executions>

-                    <execution>

-                        <id>set-bundles</id>

-                        <phase>process-test-resources</phase>

-                        <goals>

-                            <goal>copy</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-            

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-failsafe-plugin</artifactId>

-                <inherited>true</inherited>

-                <configuration>

-                    <redirectTestOutputToFile>true</redirectTestOutputToFile>

-                    <encoding>utf-8</encoding>

-                </configuration>

-                <executions>

-                    <execution>

-                        <id>verify</id>

-                        <goals>

-                            <goal>verify</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-

-            <plugin>

-                <groupId>org.apache.maven.plugins</groupId>

-                <artifactId>maven-antrun-plugin</artifactId>

-                <inherited>true</inherited>

-                <executions>

-                    <execution>

-                        <id>explodeSyncopeWAR</id>

-                        <phase>pre-integration-test</phase>

-                        <configuration>

-                            <target>

-                                <unzip src="${project.build.directory}/${project.build.finalName}.war"

-                                       dest="${cargo.run.dir}">

-                                    <patternset>

-                                        <exclude name="**/content.xml"/>

-                                        <exclude name="**/persistence.properties"/>

-                                        <exclude name="**/security.properties"/>

-                                        <exclude name="**/workflow.properties" />

-                                    </patternset>

-                                </unzip>

-                                <copy file="${project.build.directory}/test-classes/db.jsp" todir="${cargo.run.dir}"/>

-                                <copy todir="${cargo.run.dir}/WEB-INF/classes" includeEmptyDirs="false">

-                                    <fileset dir="${project.build.directory}/test-classes"/>

-                                </copy>

-                            </target>

-                        </configuration>

-                        <goals>

-                            <goal>run</goal>

-                        </goals>

-                    </execution>

-                    <execution>

-                        <id>setupCSV</id>

-                        <phase>pre-integration-test</phase>

-                        <configuration>

-                            <target>

-                                <copy file="${project.build.directory}/test-classes/test.csv" todir="${java.io.tmpdir}" overwrite="true"/>

-                            </target>    

-                        </configuration>

-                        <goals>

-                            <goal>run</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-

-            <plugin>

-                <groupId>org.codehaus.cargo</groupId>

-                <artifactId>cargo-maven2-plugin</artifactId>

-                <inherited>true</inherited>

-                <configuration>

-                    <container>

-                        <dependencies>

-                            <dependency>

-                                <groupId>com.h2database</groupId>

-                                <artifactId>h2</artifactId>

-                            </dependency>

-                        </dependencies>

-                    </container>

-                    <configuration>

-                        <type>standalone</type>

-                        <properties>

-                            <cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>

-                            <!--<cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=9009,server=y,suspend=n</cargo.jvmargs>-->

-                        </properties>

-                        <deployables>

-                            <deployable>

-                                <location>${cargo.run.dir}</location>

-                                <properties>

-                                    <context>syncope</context>

-                                </properties>

-                            </deployable>

-                            <deployable>

-                                <location>${settings.localRepository}/org/syncope/syncope-build-tools/${syncope.version}/syncope-build-tools-${syncope.version}.war</location>

-                                <properties>

-                                    <context>syncope-build-tools</context>

-                                </properties>

-                            </deployable>

-                            <deployable>

-                                <location>${settings.localRepository}/org/connid/bundles/soap/wssample/${connid.soap.version}/wssample-${connid.soap.version}.war</location>

-                                <properties>

-                                    <context>wssample</context>

-                                </properties>

-                            </deployable>

-                        </deployables>

-                    </configuration>

-                </configuration>

-                <executions>

-                    <execution>

-                        <id>start-container</id>

-                        <phase>pre-integration-test</phase>

-                        <goals>

-                            <goal>start</goal>

-                        </goals>

-                        <configuration>

-                            <wait>false</wait>

-                        </configuration>

-                    </execution>

-                    <execution>

-                        <id>stop-container</id>

-                        <phase>post-integration-test</phase>

-                        <goals>

-                            <goal>stop</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-            

-            <plugin>

-                <groupId>org.apache.openjpa</groupId>

-                <artifactId>openjpa-maven-plugin</artifactId>

-                <inherited>true</inherited>

-                <dependencies>

-                    <dependency>

-                        <groupId>com.h2database</groupId>

-                        <artifactId>h2</artifactId>

-                        <version>${h2.version}</version>

-                    </dependency>

-                </dependencies>

-                <configuration>

-                    <includes>org/syncope/core/persistence/beans/**/*.class</includes>

-                    <connectionDriverName>org.springframework.jdbc.datasource.DriverManagerDataSource</connectionDriverName>

-                    <connectionProperties>

-                        driverClassName=org.h2.Driver,

-                        url=jdbc:h2:mem:syncopedb

-                        username=sa,

-                        password=

-                    </connectionProperties>

-                </configuration>

-                <executions>

-                    <execution>

-                        <id>enhancer</id>

-                        <phase>process-classes</phase>

-                        <goals>

-                            <goal>enhance</goal>

-                        </goals>

-                    </execution>

-                </executions>

-            </plugin>

-

-        </plugins>

-

-        <resources>

-            <resource>

-                <directory>src/main/resources</directory>

-                <filtering>true</filtering>

-            </resource>

-        </resources>

 

-        <testResources>

-            <testResource>

-                <directory>src/test/resources</directory>

-                <filtering>true</filtering>

-            </testResource>

-        </testResources>

-    </build>

-</project>

+<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>${groupId}</groupId>


+        <artifactId>${rootArtifactId}</artifactId>


+        <version>${version}</version>


+    </parent>


+


+    <name>Syncope sample project core</name>


+    <groupId>${groupId}</groupId>


+    <artifactId>${artifactId}</artifactId>


+    <packaging>war</packaging>


+


+    <dependencies>


+


+        <dependency>


+            <groupId>org.apache.syncope</groupId>


+            <artifactId>syncope-client</artifactId>


+        </dependency>


+        <dependency>


+            <groupId>org.apache.syncope</groupId>


+            <artifactId>syncope-core</artifactId>


+            <type>war</type>


+        </dependency>


+        <dependency>


+            <groupId>org.apache.syncope</groupId>


+            <artifactId>syncope-core</artifactId>


+            <classifier>classes</classifier>


+        </dependency>


+


+        <dependency>


+            <groupId>javax.servlet</groupId>


+            <artifactId>servlet-api</artifactId>


+        </dependency>


+        <dependency>


+            <groupId>javax.servlet.jsp</groupId>


+            <artifactId>jsp-api</artifactId>


+        </dependency>


+        <dependency>


+            <groupId>javax.servlet</groupId>


+            <artifactId>jstl</artifactId>


+        </dependency>


+


+        <dependency>


+            <groupId>org.springframework.security</groupId>


+            <artifactId>spring-security-web</artifactId>


+        </dependency>


+        <dependency>


+            <groupId>org.springframework.security</groupId>


+            <artifactId>spring-security-config</artifactId>


+        </dependency>


+


+        <dependency>


+            <groupId>org.apache.openjpa</groupId>


+            <artifactId>openjpa-all</artifactId>


+        </dependency>


+


+        <dependency>


+            <groupId>org.codehaus.groovy</groupId>


+            <artifactId>groovy-all</artifactId>


+        </dependency>


+


+        <!-- TEST -->


+        <dependency>


+            <groupId>junit</groupId>


+            <artifactId>junit</artifactId>


+            <scope>test</scope>


+        </dependency>


+        <dependency>


+            <groupId>org.springframework</groupId>


+            <artifactId>spring-test</artifactId>


+            <scope>test</scope>


+        </dependency>


+        <dependency>


+            <groupId>com.h2database</groupId>


+            <artifactId>h2</artifactId>


+            <scope>test</scope>


+        </dependency>


+        <dependency>


+            <groupId>org.connid.bundles.soap</groupId>


+            <artifactId>org.connid.bundles.soap</artifactId>


+            <scope>test</scope>


+        </dependency>


+        <dependency>


+            <groupId>org.connid.bundles.soap</groupId>


+            <artifactId>wssample</artifactId>


+            <type>war</type>


+            <scope>test</scope>


+        </dependency>


+        <dependency>


+            <groupId>org.connid.bundles.db</groupId>


+            <artifactId>org.connid.bundles.db.table</artifactId>


+            <scope>test</scope>


+        </dependency>


+        <dependency>


+            <groupId>org.connid.bundles</groupId>


+            <artifactId>org.connid.bundles.csvdir</artifactId>


+            <scope>test</scope>


+        </dependency>


+        <dependency>


+            <groupId>org.connid.bundles</groupId>


+            <artifactId>org.connid.bundles.ldap</artifactId>


+            <scope>test</scope>


+        </dependency>


+            


+        <dependency>


+            <groupId>org.apache.syncope</groupId>


+            <artifactId>syncope-build-tools</artifactId>


+            <type>war</type>


+            <scope>test</scope>


+        </dependency>


+        <!-- /TEST -->


+


+    </dependencies>


+


+    <build>


+        <finalName>syncope</finalName>


+


+        <plugins>


+


+            <plugin>


+                <groupId>org.apache.maven.plugins</groupId>


+                <artifactId>maven-dependency-plugin</artifactId>


+                <inherited>true</inherited>


+                <executions>


+                    <execution>


+                        <id>set-bundles</id>


+                        <phase>process-test-resources</phase>


+                        <goals>


+                            <goal>copy</goal>


+                        </goals>


+                    </execution>


+                </executions>


+            </plugin>


+            


+            <plugin>


+                <groupId>org.apache.maven.plugins</groupId>


+                <artifactId>maven-failsafe-plugin</artifactId>


+                <inherited>true</inherited>


+                <configuration>


+                    <redirectTestOutputToFile>true</redirectTestOutputToFile>


+                    <encoding>utf-8</encoding>


+                </configuration>


+                <executions>


+                    <execution>


+                        <id>verify</id>


+                        <goals>


+                            <goal>verify</goal>


+                        </goals>


+                    </execution>


+                </executions>


+            </plugin>


+


+            <plugin>


+                <groupId>org.apache.maven.plugins</groupId>


+                <artifactId>maven-antrun-plugin</artifactId>


+                <inherited>true</inherited>


+                <executions>


+                    <execution>


+                        <id>explodeSyncopeWAR</id>


+                        <phase>pre-integration-test</phase>


+                        <configuration>


+                            <target>


+                                <unzip src="${project.build.directory}/${project.build.finalName}.war"


+                                       dest="${cargo.run.dir}">


+                                    <patternset>


+                                        <exclude name="**/content.xml"/>


+                                        <exclude name="**/persistence.properties"/>


+                                        <exclude name="**/security.properties"/>


+                                        <exclude name="**/workflow.properties" />


+                                    </patternset>


+                                </unzip>


+                                <copy file="${project.build.directory}/test-classes/db.jsp" todir="${cargo.run.dir}"/>


+                                <copy todir="${cargo.run.dir}/WEB-INF/classes" includeEmptyDirs="false">


+                                    <fileset dir="${project.build.directory}/test-classes"/>


+                                </copy>


+                            </target>


+                        </configuration>


+                        <goals>


+                            <goal>run</goal>


+                        </goals>


+                    </execution>


+                    <execution>


+                        <id>setupCSV</id>


+                        <phase>pre-integration-test</phase>


+                        <configuration>


+                            <target>


+                                <copy file="${project.build.directory}/test-classes/test.csv" todir="${java.io.tmpdir}" overwrite="true"/>


+                            </target>    


+                        </configuration>


+                        <goals>


+                            <goal>run</goal>


+                        </goals>


+                    </execution>


+                </executions>


+            </plugin>


+


+            <plugin>


+                <groupId>org.codehaus.cargo</groupId>


+                <artifactId>cargo-maven2-plugin</artifactId>


+                <inherited>true</inherited>


+                <configuration>


+                    <container>


+                        <dependencies>


+                            <dependency>


+                                <groupId>com.h2database</groupId>


+                                <artifactId>h2</artifactId>


+                            </dependency>


+                        </dependencies>


+                    </container>


+                    <configuration>


+                        <type>standalone</type>


+                        <properties>


+                            <cargo.servlet.port>${cargo.servlet.port}</cargo.servlet.port>


+                            <!--<cargo.jvmargs>-Xdebug -Xrunjdwp:transport=dt_socket,address=9009,server=y,suspend=n</cargo.jvmargs>-->


+                        </properties>


+                        <deployables>


+                            <deployable>


+                                <location>${cargo.run.dir}</location>


+                                <properties>


+                                    <context>syncope</context>


+                                </properties>


+                            </deployable>


+                            <deployable>


+                                <location>${settings.localRepository}/org/syncope/syncope-build-tools/${syncope.version}/syncope-build-tools-${syncope.version}.war</location>


+                                <properties>


+                                    <context>syncope-build-tools</context>


+                                </properties>


+                            </deployable>


+                            <deployable>


+                                <location>${settings.localRepository}/org/connid/bundles/soap/wssample/${connid.soap.version}/wssample-${connid.soap.version}.war</location>


+                                <properties>


+                                    <context>wssample</context>


+                                </properties>


+                            </deployable>


+                        </deployables>


+                    </configuration>


+                </configuration>


+                <executions>


+                    <execution>


+                        <id>start-container</id>


+                        <phase>pre-integration-test</phase>


+                        <goals>


+                            <goal>start</goal>


+                        </goals>


+                        <configuration>


+                            <wait>false</wait>


+                        </configuration>


+                    </execution>


+                    <execution>


+                        <id>stop-container</id>


+                        <phase>post-integration-test</phase>


+                        <goals>


+                            <goal>stop</goal>


+                        </goals>


+                    </execution>


+                </executions>


+            </plugin>


+            


+            <plugin>


+                <groupId>org.apache.openjpa</groupId>


+                <artifactId>openjpa-maven-plugin</artifactId>


+                <inherited>true</inherited>


+                <dependencies>


+                    <dependency>


+                        <groupId>com.h2database</groupId>


+                        <artifactId>h2</artifactId>


+                        <version>${h2.version}</version>


+                    </dependency>


+                </dependencies>


+                <configuration>


+                    <includes>org/syncope/core/persistence/beans/**/*.class</includes>


+                    <connectionDriverName>org.springframework.jdbc.datasource.DriverManagerDataSource</connectionDriverName>


+                    <connectionProperties>


+                        driverClassName=org.h2.Driver,


+                        url=jdbc:h2:mem:syncopedb


+                        username=sa,


+                        password=


+                    </connectionProperties>


+                </configuration>


+                <executions>


+                    <execution>


+                        <id>enhancer</id>


+                        <phase>process-classes</phase>


+                        <goals>


+                            <goal>enhance</goal>


+                        </goals>


+                    </execution>


+                </executions>


+            </plugin>


+


+        </plugins>


+


+        <resources>


+            <resource>


+                <directory>src/main/resources</directory>


+                <filtering>true</filtering>


+            </resource>


+        </resources>


+


+        <testResources>


+            <testResource>


+                <directory>src/test/resources</directory>


+                <filtering>true</filtering>


+            </testResource>


+        </testResources>


+    </build>


+</project>



Modified: incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/pom.xml?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/pom.xml (original)
+++ incubator/syncope/trunk/archetype/src/main/resources/archetype-resources/pom.xml Thu Feb 23 16:38:01 2012
@@ -18,78 +18,78 @@ specific language governing permissions 
 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/maven-v4_0_0.xsd">

-

-    <modelVersion>4.0.0</modelVersion>

-

-    <parent>

-        <groupId>org.apache.syncope</groupId>

-        <artifactId>syncope</artifactId>

-        <version>1.0-SNAPSHOT</version>

-    </parent>

-

-    <properties>

-        <syncope.version>1.0-SNAPSHOT</syncope.version>

-    </properties>

-

-    <name>Syncope sample project</name>

-    <groupId>${groupId}</groupId>

-    <artifactId>${artifactId}</artifactId>

-    <version>${version}</version>

-    <packaging>pom</packaging>

-

-    <dependencyManagement>

-        <dependencies>

-            <dependency>

-                <groupId>org.apache.syncope</groupId>

-                <artifactId>syncope-client</artifactId>

-                <version>${syncope.version}</version>

-            </dependency> 

-

-            <dependency>

-                <groupId>org.apache.syncope</groupId>

-                <artifactId>syncope-build-tools</artifactId>

-                <version>${syncope.version}</version>

-                <type>war</type>

-            </dependency> 

-            

-            <dependency>

-                <groupId>org.apache.syncope</groupId>

-                <artifactId>syncope-core</artifactId>

-                <version>${syncope.version}</version>

-                <type>war</type>

-            </dependency> 

-            <dependency>

-                <groupId>org.apache.syncope</groupId>

-                <artifactId>syncope-core</artifactId>

-                <version>${syncope.version}</version>

-                <classifier>classes</classifier>

-                <scope>provided</scope>

-            </dependency> 

-

-            <dependency>

-                <groupId>org.apache.syncope</groupId>

-                <artifactId>syncope-console</artifactId>

-                <version>${syncope.version}</version>

-                <type>war</type>

-            </dependency> 

-            <dependency>

-                <groupId>org.apache.syncope</groupId>

-                <artifactId>syncope-console</artifactId>

-                <version>${syncope.version}</version>

-                <classifier>classes</classifier>

-                <scope>provided</scope>

-            </dependency> 

-        </dependencies>

-    </dependencyManagement>

-    

-    <modules>

-        <module>core</module>

-        <module>console</module>

-    </modules>

 

-</project>

+<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/maven-v4_0_0.xsd">


+


+    <modelVersion>4.0.0</modelVersion>


+


+    <parent>


+        <groupId>org.apache.syncope</groupId>


+        <artifactId>syncope</artifactId>


+        <version>1.0-SNAPSHOT</version>


+    </parent>


+


+    <properties>


+        <syncope.version>1.0-SNAPSHOT</syncope.version>


+    </properties>


+


+    <name>Syncope sample project</name>


+    <groupId>${groupId}</groupId>


+    <artifactId>${artifactId}</artifactId>


+    <version>${version}</version>


+    <packaging>pom</packaging>


+


+    <dependencyManagement>


+        <dependencies>


+            <dependency>


+                <groupId>org.apache.syncope</groupId>


+                <artifactId>syncope-client</artifactId>


+                <version>${syncope.version}</version>


+            </dependency> 


+


+            <dependency>


+                <groupId>org.apache.syncope</groupId>


+                <artifactId>syncope-build-tools</artifactId>


+                <version>${syncope.version}</version>


+                <type>war</type>


+            </dependency> 


+            


+            <dependency>


+                <groupId>org.apache.syncope</groupId>


+                <artifactId>syncope-core</artifactId>


+                <version>${syncope.version}</version>


+                <type>war</type>


+            </dependency> 


+            <dependency>


+                <groupId>org.apache.syncope</groupId>


+                <artifactId>syncope-core</artifactId>


+                <version>${syncope.version}</version>


+                <classifier>classes</classifier>


+                <scope>provided</scope>


+            </dependency> 


+


+            <dependency>


+                <groupId>org.apache.syncope</groupId>


+                <artifactId>syncope-console</artifactId>


+                <version>${syncope.version}</version>


+                <type>war</type>


+            </dependency> 


+            <dependency>


+                <groupId>org.apache.syncope</groupId>


+                <artifactId>syncope-console</artifactId>


+                <version>${syncope.version}</version>


+                <classifier>classes</classifier>


+                <scope>provided</scope>


+            </dependency> 


+        </dependencies>


+    </dependencyManagement>


+    


+    <modules>


+        <module>core</module>


+        <module>console</module>


+    </modules>


+


+</project>



Modified: incubator/syncope/trunk/client/pom.xml
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/client/pom.xml?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/client/pom.xml (original)
+++ incubator/syncope/trunk/client/pom.xml Thu Feb 23 16:38:01 2012
@@ -52,6 +52,11 @@ under the License.
             <groupId>org.codehaus.jackson</groupId>
             <artifactId>jackson-mapper-asl</artifactId>
         </dependency>
+        
+        <dependency>
+            <groupId>com.thoughtworks.xstream</groupId>
+            <artifactId>xstream</artifactId>
+        </dependency>
 
         <dependency>
             <groupId>org.apache.httpcomponents</groupId>

Modified: incubator/syncope/trunk/client/src/main/java/org/syncope/client/to/ReportTO.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/client/src/main/java/org/syncope/client/to/ReportTO.java?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/client/src/main/java/org/syncope/client/to/ReportTO.java (original)
+++ incubator/syncope/trunk/client/src/main/java/org/syncope/client/to/ReportTO.java Thu Feb 23 16:38:01 2012
@@ -19,6 +19,7 @@
 package org.syncope.client.to;
 
 import java.util.ArrayList;
+import java.util.Date;
 import java.util.List;
 import org.syncope.client.AbstractBaseBean;
 import org.syncope.client.report.ReportletConf;
@@ -37,6 +38,12 @@ public class ReportTO extends AbstractBa
 
     private List<ReportExecTO> executions;
 
+    private String latestExecStatus;
+
+    private Date lastExec;
+
+    private Date nextExec;
+
     public ReportTO() {
         super();
 
@@ -84,11 +91,11 @@ public class ReportTO extends AbstractBa
         this.cronExpression = cronExpression;
     }
 
-    public boolean addExec(ReportExecTO execution) {
+    public boolean addExecution(ReportExecTO execution) {
         return executions.add(execution);
     }
 
-    public boolean removeExec(ReportExecTO execution) {
+    public boolean removeExecution(ReportExecTO execution) {
         return executions.remove(execution);
     }
 
@@ -99,4 +106,32 @@ public class ReportTO extends AbstractBa
     public void setExecutions(List<ReportExecTO> executions) {
         this.executions = executions;
     }
+
+    public String getLatestExecStatus() {
+        return latestExecStatus;
+    }
+
+    public void setLatestExecStatus(String latestExecStatus) {
+        this.latestExecStatus = latestExecStatus;
+    }
+
+    public Date getLastExec() {
+        return lastExec == null ? null : new Date(lastExec.getTime());
+    }
+
+    public void setLastExec(Date lastExec) {
+        if (lastExec != null) {
+            this.lastExec = new Date(lastExec.getTime());
+        }
+    }
+
+    public Date getNextExec() {
+        return nextExec == null ? null : new Date(nextExec.getTime());
+    }
+
+    public void setNextExec(Date nextExec) {
+        if (nextExec != null) {
+            this.nextExec = new Date(nextExec.getTime());
+        }
+    }
 }

Added: incubator/syncope/trunk/client/src/main/java/org/syncope/client/util/XMLSerializer.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/client/src/main/java/org/syncope/client/util/XMLSerializer.java?rev=1292848&view=auto
==============================================================================
--- incubator/syncope/trunk/client/src/main/java/org/syncope/client/util/XMLSerializer.java (added)
+++ incubator/syncope/trunk/client/src/main/java/org/syncope/client/util/XMLSerializer.java Thu Feb 23 16:38:01 2012
@@ -0,0 +1,67 @@
+/*
+ * 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.
+ */
+package org.syncope.client.util;
+
+import com.thoughtworks.xstream.XStream;
+import java.io.UnsupportedEncodingException;
+import java.net.URLDecoder;
+import java.net.URLEncoder;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
+/**
+ * Helper class for serialization and deserialization of configuration objects,
+ * empowering XStream.
+ * @see http://xstream.codehaus.org/
+ */
+public class XMLSerializer {
+
+    private static final Logger LOG =
+            LoggerFactory.getLogger(XMLSerializer.class);
+
+    public static String serialize(final Object object) {
+        String result = null;
+
+        XStream xstream = new XStream();
+        try {
+            result = URLEncoder.encode(
+                    xstream.toXML(object), "UTF-8");
+        } catch (UnsupportedEncodingException e) {
+            LOG.error("During serialization", e);
+        }
+
+        return result;
+    }
+
+    public static <T extends Object> T deserialize(
+            final String serialized) {
+
+        T result = null;
+
+        XStream xstream = new XStream();
+        try {
+            result = (T) xstream.fromXML(
+                    URLDecoder.decode(serialized, "UTF-8"));
+        } catch (UnsupportedEncodingException e) {
+            LOG.error("During deserialization", e);
+        }
+
+        return result;
+    }
+}

Propchange: incubator/syncope/trunk/client/src/main/java/org/syncope/client/util/XMLSerializer.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/syncope/trunk/client/src/main/java/org/syncope/client/util/XMLSerializer.java
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Propchange: incubator/syncope/trunk/client/src/main/java/org/syncope/client/util/XMLSerializer.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: incubator/syncope/trunk/client/src/main/java/org/syncope/client/validation/SyncopeClientErrorHandler.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/client/src/main/java/org/syncope/client/validation/SyncopeClientErrorHandler.java?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/client/src/main/java/org/syncope/client/validation/SyncopeClientErrorHandler.java (original)
+++ incubator/syncope/trunk/client/src/main/java/org/syncope/client/validation/SyncopeClientErrorHandler.java Thu Feb 23 16:38:01 2012
@@ -63,10 +63,9 @@ public class SyncopeClientErrorHandler e
                 new SyncopeClientCompositeErrorException(
                 response.getStatusCode());
 
-        SyncopeClientExceptionType exceptionType = null;
-        SyncopeClientException clientException = null;
         Set<String> handledExceptions = new HashSet<String>();
         for (String exceptionTypeAsString : exceptionTypesInHeaders) {
+            SyncopeClientExceptionType exceptionType = null;
             try {
                 exceptionType = SyncopeClientExceptionType.getFromHeaderValue(
                         exceptionTypeAsString);
@@ -78,7 +77,8 @@ public class SyncopeClientErrorHandler e
             if (exceptionType != null) {
                 handledExceptions.add(exceptionTypeAsString);
 
-                clientException = new SyncopeClientException();
+                SyncopeClientException clientException =
+                        new SyncopeClientException();
                 clientException.setType(exceptionType);
                 if (response.getHeaders().get(
                         exceptionType.getElementHeaderName()) != null

Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/commons/Constants.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/commons/Constants.java?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/commons/Constants.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/commons/Constants.java Thu Feb 23 16:38:01 2012
@@ -94,11 +94,16 @@ public final class Constants {
     public static final String PREF_USER_REQUEST_PAGINATOR_ROWS =
             "userRequest.paginator.rows";
 
+    public static final String PREF_REPORT_PAGINATOR_ROWS =
+            "report.paginator.rows";
+
     public static final String PAGEPARAM_CREATE = "CREATE";
 
     public static final String PAGEPARAM_CURRENT_PAGE = "_current_page";
 
-    /* DATE FORMATS FOR TASKS */
+    /*
+     * DATE FORMATS FOR TASKS
+     */
     public static final String ITALIAN_DATE_FORMAT = "dd/MM/yyyy HH:mm:ss";
 
     public static final String ENGLISH_DATE_FORMAT = "MM/dd/yyyy HH:mm:ss";

Added: incubator/syncope/trunk/console/src/main/java/org/syncope/console/commons/DateFormatROModel.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/commons/DateFormatROModel.java?rev=1292848&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/commons/DateFormatROModel.java (added)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/commons/DateFormatROModel.java Thu Feb 23 16:38:01 2012
@@ -0,0 +1,50 @@
+/*
+ * 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.
+ */
+package org.syncope.console.commons;
+
+import java.util.Date;
+import org.apache.wicket.model.IModel;
+import org.apache.wicket.model.PropertyModel;
+import org.syncope.console.SyncopeSession;
+
+public class DateFormatROModel implements IModel<String> {
+
+    private static final long serialVersionUID = 6677274580927636121L;
+
+    private final PropertyModel model;
+
+    public DateFormatROModel(final PropertyModel model) {
+        this.model = model;
+    }
+
+    @Override
+    public String getObject() {
+        return model.getObject() == null
+                ? "" : SyncopeSession.get().getDateFormat().
+                format((Date) model.getObject());
+    }
+
+    @Override
+    public void setObject(final String object) {
+    }
+
+    @Override
+    public void detach() {
+    }
+}
\ No newline at end of file

Added: incubator/syncope/trunk/console/src/main/java/org/syncope/console/commons/HttpResourceStream.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/commons/HttpResourceStream.java?rev=1292848&view=auto
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/commons/HttpResourceStream.java (added)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/commons/HttpResourceStream.java Thu Feb 23 16:38:01 2012
@@ -0,0 +1,157 @@
+/*
+ * 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.
+ */
+package org.syncope.console.commons;
+
+import java.io.ByteArrayInputStream;
+import java.io.IOException;
+import java.io.InputStream;
+import java.net.URI;
+import java.net.URISyntaxException;
+import org.apache.http.Header;
+import org.apache.http.HttpEntity;
+import org.apache.http.HttpResponse;
+import org.apache.http.ProtocolVersion;
+import org.apache.http.client.methods.HttpGet;
+import org.apache.http.entity.BasicHttpEntity;
+import org.apache.http.message.BasicHttpResponse;
+import org.apache.wicket.util.lang.Args;
+import org.apache.wicket.util.resource.AbstractResourceStream;
+import org.apache.wicket.util.resource.IFixedLocationResourceStream;
+import org.apache.wicket.util.resource.ResourceStreamNotFoundException;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.http.MediaType;
+import org.springframework.web.client.RestTemplate;
+import org.syncope.client.http.PreemptiveAuthHttpRequestFactory;
+
+public class HttpResourceStream extends AbstractResourceStream
+        implements IFixedLocationResourceStream {
+
+    private static final long serialVersionUID = 5811207817876330189L;
+
+    private static final Logger LOG =
+            LoggerFactory.getLogger(HttpResourceStream.class);
+
+    private final URI uri;
+
+    private final RestTemplate restTemplate;
+
+    private transient HttpEntity responseEntity;
+
+    private transient String contentType;
+
+    private transient String filename;
+
+    public HttpResourceStream(final String uri, final RestTemplate restTemplate)
+            throws URISyntaxException {
+
+        this.uri = new URI(Args.notNull(uri, "uri"));
+        this.restTemplate = Args.notNull(restTemplate, "restTemplate");
+    }
+
+    private HttpResponse buildFakeResponse(final String errorMessage) {
+        ByteArrayInputStream bais = new ByteArrayInputStream(new byte[0]);
+        BasicHttpEntity entity = new BasicHttpEntity();
+        entity.setContent(bais);
+        entity.setContentLength(0);
+        entity.setContentType(MediaType.APPLICATION_OCTET_STREAM_VALUE);
+
+        BasicHttpResponse response = new BasicHttpResponse(
+                new ProtocolVersion("HTTP", 1, 1), 400,
+                "Exception: " + errorMessage);
+        response.setEntity(entity);
+
+        response.addHeader("Content-Disposition", "attachment; filename=error");
+
+        return response;
+    }
+
+    private void execute() {
+        if (responseEntity != null) {
+            return;
+        }
+
+        HttpGet getMethod = new HttpGet(this.uri);
+        HttpResponse response;
+        try {
+            response = ((PreemptiveAuthHttpRequestFactory) restTemplate.
+                    getRequestFactory()).getHttpClient().execute(getMethod);
+        } catch (Exception e) {
+            LOG.error("Unexpected exception while executing HTTP method to {}",
+                    this.uri, e);
+            response = buildFakeResponse(e.getMessage());
+        }
+        if (response.getStatusLine().getStatusCode() != 200) {
+            LOG.error("Unsuccessful HTTP method to {}", this.uri);
+            response = buildFakeResponse("HTTP status "
+                    + response.getStatusLine().getStatusCode());
+        }
+
+        responseEntity = response.getEntity();
+
+        Header[] headers = response.getHeaders("Content-Disposition");
+        if (headers != null && headers.length > 0) {
+            String value = headers[0].getValue();
+            String[] splitted = value.split("=");
+            if (splitted != null && splitted.length > 1) {
+                filename = splitted[1].trim();
+            }
+        } else {
+            LOG.warn("Could not find Content-Disposition HTTP header");
+        }
+
+        contentType = responseEntity.getContentType().getValue();
+    }
+
+    @Override
+    public InputStream getInputStream()
+            throws ResourceStreamNotFoundException {
+
+        try {
+            execute();
+            return responseEntity.getContent();
+        } catch (Exception e) {
+            throw new ResourceStreamNotFoundException(e);
+        }
+    }
+
+    @Override
+    public void close()
+            throws IOException {
+        // Nothing needed here, because we are using HttpComponents HttpClient
+    }
+
+    @Override
+    public String locationAsString() {
+        return uri.toString();
+    }
+
+    @Override
+    public String getContentType() {
+        execute();
+
+        return contentType == null
+                ? MediaType.APPLICATION_OCTET_STREAM_VALUE : contentType;
+    }
+
+    public String getFilename() {
+        execute();
+        return filename;
+    }
+}

Modified: incubator/syncope/trunk/console/src/main/java/org/syncope/console/commons/SelectOption.java
URL: http://svn.apache.org/viewvc/incubator/syncope/trunk/console/src/main/java/org/syncope/console/commons/SelectOption.java?rev=1292848&r1=1292847&r2=1292848&view=diff
==============================================================================
--- incubator/syncope/trunk/console/src/main/java/org/syncope/console/commons/SelectOption.java (original)
+++ incubator/syncope/trunk/console/src/main/java/org/syncope/console/commons/SelectOption.java Thu Feb 23 16:38:01 2012
@@ -19,23 +19,26 @@
 package org.syncope.console.commons;
 
 import java.io.Serializable;
+import org.apache.commons.lang.builder.HashCodeBuilder;
 
 public class SelectOption implements Serializable {
 
+    private static final long serialVersionUID = 2961127533930849828L;
+
     private String displayValue;
 
     private String keyValue;
 
-    public SelectOption(String description, String cronStr) {
-        this.displayValue = description;
-        this.keyValue = cronStr;
+    public SelectOption(final String displayValue, final String keyValue) {
+        this.displayValue = displayValue;
+        this.keyValue = keyValue;
     }
 
     public String getDisplayValue() {
         return displayValue;
     }
 
-    public void setDisplayValue(String displayValue) {
+    public void setDisplayValue(final String displayValue) {
         this.displayValue = displayValue;
     }
 
@@ -43,11 +46,27 @@ public class SelectOption implements Ser
         return keyValue;
     }
 
-    public void setKeyValue(String keyValue) {
+    public void setKeyValue(final String keyValue) {
         this.keyValue = keyValue;
     }
 
     @Override
+    public boolean equals(final Object obj) {
+        if (obj == null || !(obj instanceof SelectOption)) {
+            return false;
+        }
+
+        return (keyValue == null && ((SelectOption) obj).keyValue == null)
+                || keyValue != null
+                && keyValue.equals(((SelectOption) obj).keyValue);
+    }
+
+    @Override
+    public int hashCode() {
+        return HashCodeBuilder.reflectionHashCode(this);
+    }
+
+    @Override
     public String toString() {
         return keyValue;
     }