Skip to content

fix build issue #20

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 18, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions .gitmodules

This file was deleted.

1 change: 0 additions & 1 deletion OpenAM
Submodule OpenAM deleted from 4d333c
8 changes: 5 additions & 3 deletions jee-agents-agentapp/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions copyright [year] [name of copyright owner]".
*
* Portions copyright 2023 3A Systems LLC
*
-->
<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 Project -->
<parent>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents</artifactId>
<version>4.1.5-SNAPSHOT</version>
</parent>
Expand All @@ -34,7 +36,7 @@

<dependencies>
<dependency>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents-sdk</artifactId>
<scope>provided</scope>
</dependency>
Expand All @@ -48,7 +50,7 @@
<packagingExcludes>WEB-INF/lib/*.jar</packagingExcludes>
<archive>
<manifestEntries>
<Dependencies>org.forgerock.openam.agent</Dependencies>
<Dependencies>org.openidentityplatform.openam.agent</Dependencies>
</manifestEntries>
</archive>
</configuration>
Expand Down
6 changes: 4 additions & 2 deletions jee-agents-appserver/jee-agents-appserver-common/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions copyright [year] [name of copyright owner]".
*
* Portions copyright 2023 3A Systems LLC
*
-->
<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 Project -->
<parent>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents-appserver</artifactId>
<version>4.1.5-SNAPSHOT</version>
</parent>
Expand Down Expand Up @@ -68,7 +70,7 @@
</build>
<dependencies>
<dependency>
<groupId>org.forgerock.openam</groupId>
<groupId>org.openidentityplatform.openam</groupId>
<artifactId>openam-installtools</artifactId>
</dependency>
<dependency>
Expand Down
14 changes: 8 additions & 6 deletions jee-agents-appserver/jee-agents-appserver-v81/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions copyright [year] [name of copyright owner]".
*
* Portions copyright 2023 3A Systems LLC
*
-->
<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 Project -->
<parent>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents-appserver</artifactId>
<version>4.1.5-SNAPSHOT</version>
</parent>
Expand Down Expand Up @@ -78,8 +80,8 @@
<configuration>
<artifactSet>
<includes>
<include>org.forgerock.openam.agents:jee-agents-appserver-common</include>
<include>org.forgerock.openam.agents:jee-agents-sdk</include>
<include>org.openidentityplatform.openam.agents:jee-agents-appserver-common</include>
<include>org.openidentityplatform.openam.agents:jee-agents-sdk</include>
<include>org.owasp.esapi:esapiport</include>
</includes>
</artifactSet>
Expand All @@ -89,15 +91,15 @@
</build>
<dependencies>
<dependency>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents-sdk</artifactId>
</dependency>
<dependency>
<groupId>org.forgerock.openam</groupId>
<groupId>org.openidentityplatform.openam</groupId>
<artifactId>openam-installtools</artifactId>
</dependency>
<dependency>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents-appserver-common</artifactId>
</dependency>
<dependency>
Expand Down
4 changes: 3 additions & 1 deletion jee-agents-appserver/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,13 +15,15 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions copyright [year] [name of copyright owner]".
*
* Portions copyright 2023 3A Systems LLC
*
-->
<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 Project -->
<parent>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents</artifactId>
<version>4.1.5-SNAPSHOT</version>
</parent>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions copyright [year] [name of copyright owner]".
*
* Portions copyright 2023 3A Systems LLC
*
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents-distribution</artifactId>
<version>4.1.5-SNAPSHOT</version>
</parent>
Expand Down Expand Up @@ -84,20 +86,20 @@

<dependencies>
<dependency>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents-sdk</artifactId>
</dependency>
<dependency>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents-agentapp</artifactId>
<type>war</type>
</dependency>
<dependency>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents-appserver-v81</artifactId>
</dependency>
<dependency>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents-sampleapp-appserver-ear</artifactId>
<type>ear</type>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions copyright [year] [name of copyright owner]".
*
* Portions copyright 2023 3A Systems LLC
*
-->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Expand All @@ -32,8 +34,8 @@
<outputDirectory>lib</outputDirectory>
<!-- Include fully packaged Modules -->
<includes>
<include>org.forgerock.openam:openam-installtools</include>
<include>org.forgerock.openam:openam-installtools-launcher</include>
<include>org.openidentityplatform.openam:openam-installtools</include>
<include>org.openidentityplatform.openam:openam-installtools-launcher</include>
<include>commons-io:commons-io</include>
</includes>
<useProjectArtifact>false</useProjectArtifact>
Expand All @@ -43,7 +45,7 @@
<outputFileNameMapping>agent.jar</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
<includes>
<include>org.forgerock.openam.agents:jee-agents-appserver-v81</include>
<include>org.openidentityplatform.openam.agents:jee-agents-appserver-v81</include>
</includes>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
Expand All @@ -52,7 +54,7 @@
<outputFileNameMapping>openssoclientsdk.jar</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
<includes>
<include>org.forgerock.openam:openam-clientsdk</include>
<include>org.openidentityplatform.openam:openam-clientsdk</include>
</includes>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
Expand All @@ -61,15 +63,15 @@
<outputFileNameMapping>agentapp.war</outputFileNameMapping>
<outputDirectory>etc</outputDirectory>
<includes>
<include>org.forgerock.openam.agents:jee-agents-agentapp:war</include>
<include>org.openidentityplatform.openam.agents:jee-agents-agentapp:war</include>
</includes>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<dependencySet>
<outputFileNameMapping>agentsample.ear</outputFileNameMapping>
<outputDirectory>sampleapp/dist</outputDirectory>
<includes>
<include>org.forgerock.openam.agents:jee-agents-sampleapp-appserver-ear:ear</include>
<include>org.openidentityplatform.openam.agents:jee-agents-sampleapp-appserver-ear:ear</include>
</includes>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions copyright [year] [name of copyright owner]".
*
* Portions copyright 2023 3A Systems LLC
*
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents-distribution</artifactId>
<version>4.1.5-SNAPSHOT</version>
</parent>
Expand Down Expand Up @@ -84,20 +86,20 @@

<dependencies>
<dependency>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents-sdk</artifactId>
</dependency>
<dependency>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents-agentapp</artifactId>
<type>war</type>
</dependency>
<dependency>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents-jboss-v40</artifactId>
</dependency>
<dependency>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents-sampleapp-jboss-ear</artifactId>
<type>ear</type>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -15,6 +15,8 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions copyright [year] [name of copyright owner]".
*
* Portions copyright 2023 3A Systems LLC
*
-->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.0"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Expand All @@ -32,8 +34,8 @@
<outputDirectory>lib</outputDirectory>
<!-- Include fully packaged Modules -->
<includes>
<include>org.forgerock.openam:openam-installtools</include>
<include>org.forgerock.openam:openam-installtools-launcher</include>
<include>org.openidentityplatform.openam:openam-installtools</include>
<include>org.openidentityplatform.openam:openam-installtools-launcher</include>
</includes>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
Expand All @@ -42,7 +44,7 @@
<outputFileNameMapping>agent.jar</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
<includes>
<include>org.forgerock.openam.agents:jee-agents-jboss-v40</include>
<include>org.openidentityplatform.openam.agents:jee-agents-jboss-v40</include>
</includes>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
Expand All @@ -51,7 +53,7 @@
<outputFileNameMapping>openssoclientsdk.jar</outputFileNameMapping>
<outputDirectory>lib</outputDirectory>
<includes>
<include>org.forgerock.openam:openam-clientsdk</include>
<include>org.openidentityplatform.openam:openam-clientsdk</include>
</includes>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
Expand All @@ -60,15 +62,15 @@
<outputFileNameMapping>agentapp.war</outputFileNameMapping>
<outputDirectory>etc</outputDirectory>
<includes>
<include>org.forgerock.openam.agents:jee-agents-agentapp:war</include>
<include>org.openidentityplatform.openam.agents:jee-agents-agentapp:war</include>
</includes>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
<dependencySet>
<outputFileNameMapping>agentsample.ear</outputFileNameMapping>
<outputDirectory>sampleapp/dist</outputDirectory>
<includes>
<include>org.forgerock.openam.agents:jee-agents-sampleapp-jboss-ear:ear</include>
<include>org.openidentityplatform.openam.agents:jee-agents-sampleapp-jboss-ear:ear</include>
</includes>
<useProjectArtifact>false</useProjectArtifact>
</dependencySet>
Expand Down
12 changes: 7 additions & 5 deletions jee-agents-distribution/jee-agents-distribution-jboss-v7/pom.xml
Original file line number Diff line number Diff line change
Expand Up @@ -15,12 +15,14 @@
* Header, with the fields enclosed by brackets [] replaced by your own identifying
* information: "Portions copyright [year] [name of copyright owner]".
*
* Portions copyright 2023 3A Systems LLC
*
-->
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
<modelVersion>4.0.0</modelVersion>

<parent>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents-distribution</artifactId>
<version>4.1.5-SNAPSHOT</version>
</parent>
Expand Down Expand Up @@ -84,20 +86,20 @@

<dependencies>
<dependency>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents-sdk</artifactId>
</dependency>
<dependency>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents-agentapp</artifactId>
<type>war</type>
</dependency>
<dependency>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents-jboss-v7</artifactId>
</dependency>
<dependency>
<groupId>org.forgerock.openam.agents</groupId>
<groupId>org.openidentityplatform.openam.agents</groupId>
<artifactId>jee-agents-sampleapp-jboss-ear</artifactId>
<type>ear</type>
</dependency>
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -26,13 +26,14 @@
$Id: configure.xml,v 1.2 2009/02/16 09:23:38 naghaon Exp $

Portions Copyrighted 2013-2015 ForgeRock AS.
Portions copyright 2023 3A Systems LLC
-->

<configure>
<class-prefix>
<package type="system" name="com.sun.identity.install.tools.configurator" />
<package type="common" name="com.sun.identity.agents.tools.jboss" />
<package type="custom" name="org.forgerock.openam.agents.jboss.install" />
<package type="custom" name="org.openidentityplatform.openam.agents.jboss.install" />
<package type="agentsdk" name="com.sun.identity.agents.install.configurator" />
</class-prefix>
<welcome-message>
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?>
<module xmlns="urn:jboss:module:1.0" name="org.forgerock.openam.agent">
<module xmlns="urn:jboss:module:1.0" name="org.openidentityplatform.openam.agent">

<dependencies>
<module name="javax.servlet.api" />
Expand Down
Loading