gatein SVN: r1773 - portal/trunk/docs/reference-guide/en/modules.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-02-18 01:47:16 -0500 (Thu, 18 Feb 2010)
New Revision: 1773
Modified:
portal/trunk/docs/reference-guide/en/modules/SSO.xml
Log:
Edits to SSO.xml
Modified: portal/trunk/docs/reference-guide/en/modules/SSO.xml
===================================================================
--- portal/trunk/docs/reference-guide/en/modules/SSO.xml 2010-02-18 06:47:03 UTC (rev 1772)
+++ portal/trunk/docs/reference-guide/en/modules/SSO.xml 2010-02-18 06:47:16 UTC (rev 1773)
@@ -6,7 +6,7 @@
<section id="sect-Reference_Guide-Single_Sign_On-Overview">
<title>Overview</title>
<para>
- &PRODUCT;, as an integration and aggregation platform provides some form of Single Sign On (<literal>SSO</literal>).
+ &PRODUCT;, provides some form of Single Sign On (<literal>SSO</literal>) as an integration and aggregation platform.
</para>
<para>
When logging into the portal users gain access to many systems through portlets using a single identity. In many cases, however, the portal infrastructure must be integrated with other SSO enabled systems. There are many different Identity Management solutions available. In most cases each SSO framework provides a unique way to plug into a Java EE application.
@@ -20,7 +20,7 @@
All the packages required for setup can be found in a zip file located at: <filename>http://repository.jboss.org/maven2/org/gatein/sso/sso-packaging</filename>
</para>
<para>
- When manipulating <filename>gatein.ear</filename> directly it is better to not run any portal extensions that could override the data.
+ Users are advised to not run any portal extensions that could override the data when manipulating the <filename>gatein.ear</filename> file directly.
</para>
<para>
Remove <literal>$JBOSS_HOME/server/default/deploy/gatein-sample-extension.ear</literal> and <literal>$JBOSS_HOME/server/default/deploy/gatein-sample-portal.ear</literal> which are packaged by default with &PRODUCT;.
@@ -40,36 +40,39 @@
<section id="sect-Reference_Guide-CAS_Central_Authentication_Service-CAS_server">
<title>CAS server</title>
<para>
- First we will set up the server to authenticate against the portal login module. You can find more information about setting up the server by reading the official CAS documentation, here we will install the CAS server on Tomcat
+ First, set up the server to authenticate against the portal login module. In this example the CAS server will be installed on Tomcat.
</para>
<section id="sect-Reference_Guide-CAS_server-Obtaining_CAS">
<title>Obtaining CAS</title>
<para>
- You can download CAS from http://www.jasig.org/cas/download.
+ CAS can be downloaded from <ulink type="http" url="http://www.jasig.org/cas/download">http://www.jasig.org/cas/download</ulink>.
</para>
<para>
- Once downloaded extract it in what we will call $CAS_HOME from now.
+ Extract the downloaded file into a suitable location. This location will be referred to as <literal>$CAS_HOME</literal> in the following example.
</para>
</section>
<section id="sect-Reference_Guide-CAS_server-Modifying_CAS_server">
<title>Modifying CAS server</title>
<para>
- To simplify we will directly modify the sources so that the produced web archive is configured the way we want.
+ To configure the web archive as desired, it is simpler to directly modify the sources.
</para>
<para>
- First we will want to change the authenticaton handler to use the portal authentication handler:
+ To change the authentication handler to use the portal authentication handler:
</para>
<para>
- The CAS Server Plugin makes secure authentication callbacks to a RESTful service installed on the remote GateIn server in order to authenticate a user. In order for the plugin to function correctly, it needs to be properly configured to connect to this service. This configuration is done via the <emphasis>cas.war/WEB-INF/deployerConfigContext.xml </emphasis> file.
+ The CAS Server Plugin makes secure authentication callbacks to a RESTful service installed on the remote GateIn server in order to authenticate a user.
</para>
- <orderedlist>
- <listitem>
+ <para>
+ In order for the plugin to function correctly, it needs to be properly configured to connect to this service. This configuration is done via the <filename>cas.war/WEB-INF/deployerConfigContext.xml </filename> file.
+ </para>
+ <procedure>
+ <step>
<para>
- Open $CAS_HOME/cas-server-webapp/src/main/webapp/WEB-INF/deployerConfigContext.xml
+ Open <filename>CAS_HOME/cas-server-webapp/src/main/webapp/WEB-INF/deployerConfigContext.xml</filename>
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
Replace:
<programlisting> <!--
@@ -99,10 +102,10 @@
</property>
</programlisting>
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
- With the following (Make sure to set the host, port and context with the values corresponding to your portal). Also available in $GATEIN_SSO/cas/plugin/WEB-INF/deployerConfigContext.xml
+ With the following (Make sure to set the host, port and context with the values corresponding to your portal). Also available in <filename>GATEIN_SSO/cas/plugin/WEB-INF/deployerConfigContext.xml</filename>.
</para>
<para>
@@ -141,59 +144,64 @@
</property>
</programlisting>
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
- Copy $GATEIN_SSO/cas/plugin/WEB-INF/lib/sso-cas-plugin-<VERSION>.jar and $GATEIN_SSO/cas/plugin/WEB-INF/lib/commons-httpclient-<VERSION>.jar into the newly created directory $CAS_HOME/cas-server-webapp/src/main/webapp/WEB-INF/lib
+ Copy <filename>GATEIN_SSO/cas/plugin/WEB-INF/lib/sso-cas-plugin-<VERSION>.jar</filename> and <filename>GATEIN_SSO/cas/plugin/WEB-INF/lib/commons-httpclient-<VERSION>.jar</filename> into the <filename>CAS_HOME/cas-server-webapp/src/main/webapp/WEB-INF/lib</filename> created directory.
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
- Get an installation of Tomcat and extract it in what we will call $TOMCAT_HOME. Change the default port to avoid a conflict with the default GateIn (for testing purposes). Edit $TOMCAT_HOME/conf/server.xml and replace the 8080 port to 8888.
+ Get an installation of Tomcat and extract it into a suitable location (which will be called <filename>TOMCAT_HOME</filename> for these instructions).
+ </para>
+ <para>
+ Change the default port to avoid a conflict with the default &PRODUCT; (for testing purposes). Edit <filename>TOMCAT_HOME/conf/server.xml</filename> and replace the 8080 port to 8888.
<note>
<para>
- If you are running GateIn with Tomcat on the same machine you will also need to change the port 8005 to something else to avoid port conflicts.
+ If &PRODUCT; is running with Tomcat on the same machine the port 8005 should be changed to something else to avoid port conflicts.
</para>
</note>
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
- Go to $CAS_HOME/cas-server-webapp and do 'mvn install'
+ Go to <filename>CAS_HOME/cas-server-webapp</filename> and execute the command:
+<programlisting>mvn install
+</programlisting>
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
- Copy $CAS_HOME/cas-server-webapp/target/cas.war into $TOMCAT_HOME/webapps
+ Copy <filename>CAS_HOME/cas-server-webapp/target/cas.war</filename> into <filename>TOMCAT_HOME/webapps</filename>.
</para>
<para>
- Now you should be able to start Tomcat and access http://localhost:8888/cas but at this stage you won't be able to login.
+ Tomcat should start and be accessible at <ulink type="http" url="http://localhost:8888/cas">http://localhost:8888/cas</ulink>. Note that at this stage login won't be available.
</para>
<mediaobject>
<imageobject>
<imagedata fileref="images/cas.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
- </listitem>
- </orderedlist>
+ </step>
+ </procedure>
</section>
</section>
<section id="sect-Reference_Guide-CAS_Central_Authentication_Service-Setup_the_CAS_client">
<title>Setup the CAS client</title>
- <orderedlist>
- <listitem>
+ <procedure>
+ <step>
<para>
- Copy all libraries from $GATEIN_SSO/cas/gatein.ear/lib into $JBOSS_HOME/server/default/deploy/gatein.ear/lib (Or if you are running GateIn in Tomcat, in $GATEIN_HOME/lib)
+ Copy all libraries from <filename>GATEIN_SSO/cas/gatein.ear/lib</filename> into <filename>JBOSS_HOME/server/default/deploy/gatein.ear/lib</filename> (Or in Tomcat, into $<filename>GATEIN_HOME/lib</filename>)
</para>
- </listitem>
- <listitem>
- <para>
- In JBoss AS, edit gatein.ear/META-INF/gatein-jboss-beans.xml and uncomment this section
- </para>
- <para>
-
+ </step>
+ <step>
+ <itemizedlist>
+ <listitem>
+ <para>
+ In JBoss AS, edit <filename>gatein.ear/META-INF/gatein-jboss-beans.xml</filename> and uncomment this section:
+ </para>
<programlisting><authentication>
<login-module code="org.gatein.sso.agent.login.SSOLoginModule" flag="required">
</login-module>
@@ -203,35 +211,51 @@
</login-module>
</authentication>
</programlisting>
- </para>
- <para>
- If you are running GateIn in Tomcat, edit $GATEIN_HOME/conf/jaas.conf and uncomment this section
- </para>
- <para>
-
+
+ </listitem>
+ <listitem>
+ <para>
+ In Tomcat, edit <filename>GATEIN_HOME/conf/jaas.conf</filename> and uncomment this section:
+ </para>
<programlisting>org.gatein.sso.agent.login.SSOLoginModule required
org.exoplatform.services.security.j2ee.JbossLoginModule required
portalContainerName=portal
realmName=gatein-domain
</programlisting>
- At this point, you can test the installation, start GateIn (assuming that the CAS server using Tomcat is still running) by going to http://localhost:8888/cas you should be able to login with username 'root' and password 'gtn' or any account created through the portal.
+ </listitem>
+ </itemizedlist>
+ </step>
+ <step>
+ <para>
+ The installation can be tested at this point:
</para>
- </listitem>
- </orderedlist>
+ <procedure>
+ <step>
+ <para>
+ Access &PRODUCT; (if the CAS server using Tomcat is still running) by going to <ulink type="http" url="http://localhost:8888/cas">http://localhost:8888/cas</ulink>.
+ </para>
+ </step>
+ <step>
+ <para>
+ Login with the username <literal>root</literal> and the password <literal>gtn</literal> (or any account created through the portal).
+ </para>
+ </step>
+ </procedure>
+ </step>
+ </procedure>
</section>
- <section id="sect-Reference_Guide-CAS_Central_Authentication_Service-Setup_the_portal_to_redirect_to_CAS">
- <title>Setup the portal to redirect to CAS</title>
+ <section id="sect-Reference_Guide-CAS_Central_Authentication_Service-Redirect_to_CAS">
+ <title>Redirect to CAS</title>
<para>
- Now we want to tell GateIn to redirect all user authentication to the CAS server.
+ To utilize the Central Authentication Service, &PRODUCT; needs to redirect all user authentication to the CAS server.
</para>
<para>
- The CAS server can be located anywhere on the Internet, and this information must be properly configured within the GateIn instance. This configuration needs to be done in 3 files
+ Information about where the CAS is hosted must be properly configured within the &PRODUCT; instance. The required configuration is done in three files:
<itemizedlist>
<listitem>
- <emphasis>In gatein.ear/02portal.war/groovy/portal/webui/UILoginForm.gtmpl replace the javascript at the bottom by:</emphasis>
<para>
-
+ In the <filename>gatein.ear/02portal.war/groovy/portal/webui/UILoginForm.gtmpl</filename> file replace the javascript code at the end with:
<programlisting><script>
<%=uicomponent.event("Close");%>
window.location = 'http://localhost:8888/cas/login?service=http://localhost:8080/portal/private/classic';
@@ -240,8 +264,9 @@
</para>
</listitem>
<listitem>
- <emphasis>In gatein.ear/02portal.war/login/jsp/login.jsp replace everything by:</emphasis>
<para>
+ Replace the contents of the <filename>gatein.ear/02portal.war/login/jsp/login.jsp</filename> file with:
+
<programlisting><html>
<head>
@@ -256,9 +281,8 @@
</para>
</listitem>
<listitem>
- <emphasis>In gatein.ear/02portal.war/WEB-INF/web.xml replace the InitiateLoginServlet declaration by:</emphasis>
<para>
-
+ Replace the <literal>InitiateLoginServlet</literal> declaration in <filename>gatein.ear/02portal.war/WEB-INF/web.xml</filename> with:
<programlisting><servlet>
<servlet-name>InitiateLoginServlet</servlet-name>
<servlet-class>org.gatein.sso.agent.GenericSSOAgent</servlet-class>
@@ -273,7 +297,7 @@
</itemizedlist>
</para>
<para>
- From now on, all links redirecting to the user authentication pages will redirect to the CAS centralized authentication form.
+ Once these changes have been made, all links to the user authentication pages will redirect to the CAS centralized authentication form.
</para>
</section>
@@ -282,76 +306,102 @@
<section id="sect-Reference_Guide-Single_Sign_On-JOSSO">
<title>JOSSO</title>
<para>
- This Single Sign On plugin enables seamless integration between GateIn Portal and the JOSSO Single Sign On Framework. Details about OpenSSO can be found <ulink url="http://www.ja-sig.org/products/cas/">here.</ulink>
+ This Single Sign On plugin enables seamless integration between &PRODUCT; and the JOSSO Single Sign On Framework. Details about OpenSSO can be found <ulink url="http://www.ja-sig.org/products/cas/">here</ulink>.
</para>
<para>
- The integration consitsts in two parts, the first part consists of installing or configuring a JOSSO server, the second part consists of setting up the portal to use the JOSSO server.
+ Setting up this integration happens in two distinct actions. The first part is installing or configuring a JOSSO server and the second involves setting up the portal to use the JOSSO server.
</para>
<section id="sect-Reference_Guide-JOSSO-JOSSO_server">
<title>JOSSO server</title>
<para>
- First we will set up the server to authenticate against the portal login module. You can find more information about setting up the server by reading the official JOSSO documentation, here we will install the JOSSO server on Tomcat
+ This section details setting up the JOSSO server to authenticate against the &PRODUCT; login module.
</para>
+ <para>
+ In this example the JOSSO server will be installed on Tomcat.
+ </para>
<section id="sect-Reference_Guide-JOSSO_server-Obtaining_JOSSO">
<title>Obtaining JOSSO</title>
<para>
- You can download JOSSO from http://sourceforge.net/projects/josso/files/ We will use the package that embeds Apache Tomcat.
+ JOSSO can be downloaded from <ulink type="http" url="http://sourceforge.net/projects/josso/files/">http://sourceforge.net/projects/josso/files/</ulink>. Use the package that embeds Apache Tomcat.
</para>
<para>
- Once downloaded extract it in what we will call $JOSSO_HOME from now.
+ Once downloaded, extract the package into what will be called <filename>JOSSO_HOME</filename> in this example.
</para>
</section>
<section id="sect-Reference_Guide-JOSSO_server-Modifying_JOSSO_server">
<title>Modifying JOSSO server</title>
- <orderedlist>
- <listitem>
+ <procedure>
+ <step>
<para>
- Copy the files from $GATEIN_SSO/josso/plugin into the Tomcat directory ($JOSSO_HOME).
+ Copy the files from <filename>GATEIN_SSO/josso/plugin</filename> into the Tomcat directory (<filename>JOSSO_HOME</filename>).
</para>
<para>
- It should replace or add $JOSSO_HOME/lib/josso-gateway-config.xml $JOSSO_HOME/lib/josso-gateway-gatein-stores.xml $JOSSO_HOME/webapps/josso/WEB-INF/classes/gatein.properties and add required jars into $JOSSO_HOME/webapps/josso/WEB-INF/lib
+ This action should replace or add the following files to the <filename>JOSSO_HOME/webapps/josso/WEB-INF/lib</filename> directory:
</para>
- </listitem>
- <listitem>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>JOSSO_HOME/lib/josso-gateway-config.xml</filename>
+ </para>
+ </listitem>
+ <listitem>
+ <para>
+ <filename>JOSSO_HOME/lib/josso-gateway-gatein-stores.xml</filename>
+ </para>
+ </listitem>
+ </itemizedlist>
<para>
- Change the default Tomcat ports to avoid a conflict with the default GateIn (for testing purposes). Edit $TOMCAT_HOME/conf/server.xml and replace the 8080 port to 8888.
+ and
+ </para>
+ <itemizedlist>
+ <listitem>
+ <para>
+ <filename>JOSSO_HOME/webapps/josso/WEB-INF/classes/gatein.properties</filename>
+ </para>
+ </listitem>
+ </itemizedlist>
+ </step>
+ <step>
+ <para>
+ Edit <filename>TOMCAT_HOME/conf/server.xml</filename> and replace the 8080 port to 8888 to change the default Tomcat port and avoid a conflict with the default &PRODUCT; port (for testing purposes).
<note>
+ <title>Port Conflicts</title>
<para>
- If you are running GateIn with Tomcat on the same machine you will also need to change other ports to something else to avoid port conflicts.
+ If &PRODUCT; is being on a machine with Tomcat, other ports will need to be changed to avoid conflicts.
</para>
</note>
</para>
- </listitem>
- <listitem>
+ </step>
+ <step>
<para>
- Now you should be able to start Tomcat and access http://localhost:8888/josso/signon/login.do but at this stage you won't be able to login.
+ Tomcat should now start and allow access to <ulink type="http" url="http://localhost:8888/josso/signon/login.do">http://localhost:8888/josso/signon/login.do</ulink> but at this stage login will not be available.
</para>
<mediaobject>
<imageobject>
<imagedata fileref="images/opensso.png" format="PNG" width="444" />
</imageobject>
</mediaobject>
- </listitem>
- </orderedlist>
+ </step>
+ </procedure>
</section>
</section>
<section id="sect-Reference_Guide-JOSSO-Setup_the_JOSSO_client">
<title>Setup the JOSSO client</title>
- <orderedlist>
- <listitem>
+ <procedure>
+ <step>
<para>
- Copy the libs from $GATEIN_SS)/josso/gatein.ear/lib into gatein.ear/lib (Or if you are running GateIn in Tomcat, in $GATEIN_HOME/lib)
+ Copy the library files from <filename>GATEIN_SS)/josso/gatein.ear/lib</filename> into <filename>gatein.ear/lib</filename> (Or into <filename>GATEIN_HOME/lib</filename> if &PRODUCT; is running in Tomcat)
</para>
- </listitem>
- <listitem>
- <para>
- In JBoss AS, edit gatein.ear/META-INF/gatein-jboss-beans.xml and uncomment this section
- </para>
- <para>
-
+ </step>
+ <step>
+ <itemizedlist>
+ <listitem>
+ <para>
+ In JBoss AS, edit <filename>gatein.ear/META-INF/gatein-jboss-beans.xml</filename> and uncomment this section:
+ </para>
<programlisting><authentication>
<login-module code="org.gatein.sso.agent.login.SSOLoginModule" flag="required">
</login-module>
@@ -361,21 +411,37 @@
</login-module>
</authentication>
</programlisting>
- </para>
- <para>
- If you are running GateIn in Tomcat, edit $GATEIN_HOME/conf/jaas.conf and uncomment this section
- </para>
- <para>
-
+ </listitem>
+ <listitem>
+ <para>
+ In Tomcat, edit <filename>GATEIN_HOME/conf/jaas.conf</filename> and uncomment this section:
+ </para>
<programlisting>org.gatein.sso.agent.login.SSOLoginModule required
org.exoplatform.services.security.j2ee.JbossLoginModule required
portalContainerName=portal
realmName=gatein-domain
</programlisting>
- At this point, you can test the installation, start GateIn (assuming that the JOSSO server using Tomcat is still running) by going to http://localhost:8888/josso/signon/login.do you should be able to login with username 'root' and password 'gtn' or any account created through the portal.
+ </listitem>
+ </itemizedlist>
+ </step>
+ <step>
+ <para>
+ The installation can be tested at this point.
</para>
- </listitem>
- </orderedlist>
+ <procedure>
+ <step>
+ <para>
+ Start &PRODUCT; (assuming that the JOSSO server using Tomcat is running) by going to <ulink type="http" url="http://localhost:8888/josso/signon/login.do">http://localhost:8888/josso/signon/login.do</ulink>.
+ </para>
+ </step>
+ <step>
+ <para>
+ Login with the username <literal>root</literal> and the password <literal>gtn</literal> or any account created through the portal.
+ </para>
+ </step>
+ </procedure>
+ </step>
+ </procedure>
</section>
<section id="sect-Reference_Guide-JOSSO-Setup_the_portal_to_redirect_to_JOSSO">
@@ -387,8 +453,9 @@
The CAS server can be located anywhere on the Internet, and this information must be properly configured within the GateIn instance. This configuration needs to be done in 3 files
<itemizedlist>
<listitem>
+ <para>
<emphasis>In gatein.ear/02portal.war/groovy/portal/webui/UILoginForm.gtmpl replace the javascript at the bottom by:</emphasis>
- <para>
+
<programlisting><script>
<%=uicomponent.event("Close");%>
@@ -398,8 +465,9 @@
</para>
</listitem>
<listitem>
+ <para>
<emphasis>In gatein.ear/02portal.war/login/jsp/login.jsp replace everything by:</emphasis>
- <para>
+
<programlisting><html>
<head>
@@ -414,8 +482,9 @@
</para>
</listitem>
<listitem>
+ <para>
<emphasis>In gatein.ear/02portal.war/WEB-INF/web.xml replace the InitiateLoginServlet declaration by:</emphasis>
- <para>
+
<programlisting><servlet>
<servlet-name>InitiateLoginServlet</servlet-name>
@@ -588,8 +657,9 @@
The OpenSSO server can be located anywhere on the Internet, and this information must be properly configured within the GateIn instance. This configuration needs to be done in 3 files
<itemizedlist>
<listitem>
+ <para>
<emphasis>In gatein.ear/02portal.war/groovy/portal/webui/UILoginForm.gtmpl replace the javascript at the bottom by:</emphasis>
- <para>
+
<programlisting><script>
<%=uicomponent.event("Close");%>
@@ -599,8 +669,9 @@
</para>
</listitem>
<listitem>
+ <para>
<emphasis>In gatein.ear/02portal.war/login/jsp/login.jsp replace everything by:</emphasis>
- <para>
+
<programlisting><html>
<head>
@@ -615,8 +686,9 @@
</para>
</listitem>
<listitem>
+ <para>
<emphasis>In gatein.ear/02portal.war/WEB-INF/web.xml replace the InitiateLoginServlet declaration by:</emphasis>
- <para>
+
<programlisting><servlet>
<servlet-name>InitiateLoginServlet</servlet-name>
14 years, 10 months
- 1
- 0
gatein SVN: r1772 - portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US.
by do-not-reply＠jboss.org
Author: smumford
Date: 2010-02-18 01:47:03 -0500 (Thu, 18 Feb 2010)
New Revision: 1772
Modified:
portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/Reference_Guide.xml
Log:
Edits to SSO.xml
Modified: portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/Reference_Guide.xml
===================================================================
--- portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/Reference_Guide.xml 2010-02-17 17:01:59 UTC (rev 1771)
+++ portal/branches/EPP_5_0_0_Branch_Docs/Enterprise_Portal_Platform_Reference_Guide/en-US/Reference_Guide.xml 2010-02-18 06:47:03 UTC (rev 1772)
@@ -6,7 +6,9 @@
<xi:include href="Preface.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="modules/Introduction.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="modules/Configuration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
- <!-- <xi:include href="modules/Integration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> --><xi:include href="modules/Development.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <!-- <xi:include href="modules/Integration.xml" xmlns:xi="http://www.w3.org/2001/XInclude" /> -->
+ <xi:include href="modules/SSO.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
+ <xi:include href="modules/Development.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="modules/Portlets.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="modules/Gadgets.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
<xi:include href="Revision_History.xml" xmlns:xi="http://www.w3.org/2001/XInclude" />
14 years, 10 months
- 1
- 0
gatein SVN: r1771 - in portal/trunk: component/management/src/main/java/org/exoplatform/management and 3 other directories.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-17 12:01:59 -0500 (Wed, 17 Feb 2010)
New Revision: 1771
Removed:
portal/trunk/component/common/src/main/java/org/exoplatform/commons/management/
Modified:
portal/trunk/component/management/src/main/java/org/exoplatform/management/RestManagementProvider.java
portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java
portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java
portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateStatisticService.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationStatisticService.java
portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStatisticService.java
Log:
replace @Rest annotation by @RESTEndpoint annotation
Modified: portal/trunk/component/management/src/main/java/org/exoplatform/management/RestManagementProvider.java
===================================================================
--- portal/trunk/component/management/src/main/java/org/exoplatform/management/RestManagementProvider.java 2010-02-17 13:52:56 UTC (rev 1770)
+++ portal/trunk/component/management/src/main/java/org/exoplatform/management/RestManagementProvider.java 2010-02-17 17:01:59 UTC (rev 1771)
@@ -19,9 +19,9 @@
package org.exoplatform.management;
-import org.exoplatform.commons.management.Rest;
import org.exoplatform.management.data.RestResource;
import org.exoplatform.container.ExoContainerContext;
+import org.exoplatform.management.management.annotations.RESTEndpoint;
import org.exoplatform.management.spi.ManagedResource;
import org.exoplatform.management.spi.ManagementProvider;
import org.exoplatform.portal.config.UserACL;
@@ -100,12 +100,12 @@
Object resource = managedResource.getResource();
//
- Rest annotation = resource.getClass().getAnnotation(Rest.class);
+ RESTEndpoint annotation = resource.getClass().getAnnotation(RESTEndpoint.class);
//
if (annotation != null)
{
- String name = annotation.value();
+ String name = annotation.path();
ResourceKey key = new ResourceKey(name);
resourceMap.put(key, new RestResource(name, managedResource));
return key;
Modified: portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java
===================================================================
--- portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java 2010-02-17 13:52:56 UTC (rev 1770)
+++ portal/trunk/component/portal/src/main/java/org/exoplatform/portal/resource/SkinService.java 2010-02-17 17:01:59 UTC (rev 1771)
@@ -19,7 +19,6 @@
package org.exoplatform.portal.resource;
-import org.exoplatform.commons.management.Rest;
import org.exoplatform.commons.utils.PropertyManager;
import org.exoplatform.commons.utils.Safe;
import org.exoplatform.container.ExoContainerContext;
@@ -30,6 +29,7 @@
import org.exoplatform.management.annotations.ManagedName;
import org.exoplatform.management.jmx.annotations.NameTemplate;
import org.exoplatform.management.jmx.annotations.Property;
+import org.exoplatform.management.management.annotations.RESTEndpoint;
import org.exoplatform.services.log.ExoLogger;
import org.exoplatform.services.log.Log;
import org.exoplatform.services.resources.Orientation;
@@ -59,7 +59,7 @@
@NameTemplate({@Property(key = "view", value = "portal"), @Property(key = "service", value = "management"),
@Property(key = "type", value = "skin")})
@ManagedDescription("Skin service")
-@Rest("skinservice")
+@RESTEndpoint(path = "skinservice")
public class SkinService implements Startable
{
Modified: portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java
===================================================================
--- portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java 2010-02-17 13:52:56 UTC (rev 1770)
+++ portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateService.java 2010-02-17 17:01:59 UTC (rev 1771)
@@ -22,7 +22,6 @@
import groovy.lang.Writable;
import groovy.text.Template;
-import org.exoplatform.commons.management.Rest;
import org.exoplatform.commons.utils.IOUtil;
import org.exoplatform.container.xml.InitParams;
import org.exoplatform.groovyscript.GroovyTemplate;
@@ -34,6 +33,7 @@
import org.exoplatform.management.annotations.ManagedName;
import org.exoplatform.management.jmx.annotations.NameTemplate;
import org.exoplatform.management.jmx.annotations.Property;
+import org.exoplatform.management.management.annotations.RESTEndpoint;
import org.exoplatform.resolver.ResourceResolver;
import org.exoplatform.services.cache.CacheService;
import org.exoplatform.services.cache.ExoCache;
@@ -48,7 +48,7 @@
@NameTemplate({@Property(key = "view", value = "portal"), @Property(key = "service", value = "management"),
@Property(key = "type", value = "template")})
@ManagedDescription("Template management service")
-@Rest("templateservice")
+@RESTEndpoint(path = "templateservice")
public class TemplateService
{
Modified: portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateStatisticService.java
===================================================================
--- portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateStatisticService.java 2010-02-17 13:52:56 UTC (rev 1770)
+++ portal/trunk/component/scripting/src/main/java/org/exoplatform/groovyscript/text/TemplateStatisticService.java 2010-02-17 17:01:59 UTC (rev 1771)
@@ -19,7 +19,6 @@
package org.exoplatform.groovyscript.text;
-import org.exoplatform.commons.management.Rest;
import org.exoplatform.management.annotations.Impact;
import org.exoplatform.management.annotations.ImpactType;
import org.exoplatform.management.annotations.Managed;
@@ -27,6 +26,7 @@
import org.exoplatform.management.annotations.ManagedName;
import org.exoplatform.management.jmx.annotations.NameTemplate;
import org.exoplatform.management.jmx.annotations.Property;
+import org.exoplatform.management.management.annotations.RESTEndpoint;
import java.util.ArrayList;
import java.util.Collections;
@@ -49,7 +49,7 @@
@Property(key = "view", value = "portal"),
@Property(key = "service", value = "statistic"),
@Property(key = "type", value = "template")})
-@Rest("templatestatistics")
+@RESTEndpoint(path = "templatestatistics")
public class TemplateStatisticService
{
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationStatisticService.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationStatisticService.java 2010-02-17 13:52:56 UTC (rev 1770)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/ApplicationStatisticService.java 2010-02-17 17:01:59 UTC (rev 1771)
@@ -19,7 +19,6 @@
package org.exoplatform.portal.application;
-import org.exoplatform.commons.management.Rest;
import org.exoplatform.management.annotations.Impact;
import org.exoplatform.management.annotations.ImpactType;
import org.exoplatform.management.annotations.Managed;
@@ -27,6 +26,7 @@
import org.exoplatform.management.annotations.ManagedName;
import org.exoplatform.management.jmx.annotations.NameTemplate;
import org.exoplatform.management.jmx.annotations.Property;
+import org.exoplatform.management.management.annotations.RESTEndpoint;
import org.picocontainer.Startable;
import java.util.ArrayList;
@@ -46,7 +46,7 @@
@Property(key = "view", value = "portal"),
@Property(key = "service", value = "statistic"),
@Property(key = "type", value = "application")})
-@Rest("applicationstatistic")
+@RESTEndpoint(path = "applicationstatistic")
public class ApplicationStatisticService implements Startable
{
Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStatisticService.java
===================================================================
--- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStatisticService.java 2010-02-17 13:52:56 UTC (rev 1770)
+++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/PortalStatisticService.java 2010-02-17 17:01:59 UTC (rev 1771)
@@ -19,7 +19,6 @@
package org.exoplatform.portal.application;
-import org.exoplatform.commons.management.Rest;
import org.exoplatform.management.annotations.Impact;
import org.exoplatform.management.annotations.ImpactType;
import org.exoplatform.management.annotations.Managed;
@@ -27,6 +26,7 @@
import org.exoplatform.management.annotations.ManagedName;
import org.exoplatform.management.jmx.annotations.NameTemplate;
import org.exoplatform.management.jmx.annotations.Property;
+import org.exoplatform.management.management.annotations.RESTEndpoint;
import org.exoplatform.portal.config.UserPortalConfigService;
import org.picocontainer.Startable;
@@ -44,7 +44,7 @@
@Property(key = "view", value = "portal"),
@Property(key = "service", value = "statistic"),
@Property(key = "type", value = "portal")})
-@Rest("portalstatistic")
+@RESTEndpoint(path = "portalstatistic")
public class PortalStatisticService implements Startable
{
14 years, 10 months
- 1
- 0
gatein SVN: r1770 - in portal/trunk: portlet/exoadmin/src/main/webapp/WEB-INF and 1 other directory.
by do-not-reply＠jboss.org
Author: julien_viet
Date: 2010-02-17 08:52:56 -0500 (Wed, 17 Feb 2010)
New Revision: 1770
Modified:
portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java
portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml
Log:
GTNPORTAL-677 : Filter application registry import
Modified: portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java
===================================================================
--- portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2010-02-17 09:19:22 UTC (rev 1769)
+++ portal/trunk/component/application-registry/src/main/java/org/exoplatform/application/registry/impl/ApplicationRegistryServiceImpl.java 2010-02-17 13:52:56 UTC (rev 1770)
@@ -37,7 +37,8 @@
import org.exoplatform.portal.pom.spi.portlet.Portlet;
import org.exoplatform.portal.pom.spi.wsrp.WSRP;
import org.gatein.common.i18n.LocalizedString;
-import org.gatein.common.util.Tools;
+import org.gatein.common.logging.Logger;
+import org.gatein.common.logging.LoggerFactory;
import org.gatein.mop.api.content.ContentType;
import org.gatein.mop.api.content.Customization;
import org.gatein.pc.api.PortletInvoker;
@@ -45,11 +46,7 @@
import org.gatein.pc.api.info.PortletInfo;
import org.picocontainer.Startable;
-import java.util.ArrayList;
-import java.util.Collections;
-import java.util.Comparator;
-import java.util.List;
-import java.util.Set;
+import java.util.*;
/**
* The fundamental reason that motives to use tasks is because of the JMX access that does not
@@ -63,6 +60,9 @@
{
/** . */
+ private static final String INTERNAL_PORTLET_TAG = "gatein_internal";
+
+ /** . */
private static final String REMOTE_CATEGORY_NAME = "remote";
/** . */
@@ -75,6 +75,9 @@
private final ChromatticLifeCycle lifeCycle;
/** . */
+ private final Logger log = LoggerFactory.getLogger(ApplicationRegistryServiceImpl.class);
+
+ /** . */
final POMSessionManager mopManager;
public ApplicationRegistryServiceImpl(ChromatticManager manager, POMSessionManager mopManager)
@@ -393,11 +396,15 @@
ContentRegistry registry = getContentRegistry();
//
+ log.info("About to import portlets in application registry");
+
+ //
ExoContainer manager = ExoContainerContext.getCurrentContainer();
PortletInvoker portletInvoker = (PortletInvoker)manager.getComponentInstance(PortletInvoker.class);
Set<org.gatein.pc.api.Portlet> portlets = portletInvoker.getPortlets();
//
+ portlet:
for (org.gatein.pc.api.Portlet portlet : portlets)
{
PortletInfo info = portlet.getInfo();
@@ -411,32 +418,46 @@
LocalizedString keywordsLS = info.getMeta().getMetaValue(MetaInfo.KEYWORDS);
- String[] categoryNames = null;
+ //
+ Set<String> categoryNames = new HashSet<String>();
+
+ // Process keywords
if (keywordsLS != null)
{
String keywords = keywordsLS.getDefaultString();
if (keywords != null && keywords.length() != 0)
{
- categoryNames = keywords.split(",");
+ for (String categoryName : keywords.split(",")) {
+ // Trim name
+ categoryName = categoryName.trim();
+ if (INTERNAL_PORTLET_TAG.equalsIgnoreCase(categoryName)) {
+ log.debug("Skipping portlet (" + portletApplicationName + "," + portletName + ") + tagged as internal");
+ continue portlet;
+ } else {
+ categoryNames.add(categoryName);
+ }
+ }
}
}
- if (categoryNames == null || categoryNames.length == 0)
+ // If no keywords, use the portlet application name
+ if (categoryNames.isEmpty())
{
- categoryNames = new String[]{portletApplicationName};
+ categoryNames.add(portletApplicationName.trim());
}
+ // Additionally categorise the portlet as remote
if (portlet.isRemote())
{
- categoryNames = Tools.appendTo(categoryNames, REMOTE_CATEGORY_NAME);
+ categoryNames.add(REMOTE_CATEGORY_NAME);
}
//
+ log.info("Importing portlet (" + portletApplicationName + "," + portletName + ") in categories " + categoryNames);
+
+ // Process categoriy names
for (String categoryName : categoryNames)
{
- categoryName = categoryName.trim();
-
- //
CategoryDefinition category = registry.getCategory(categoryName);
//
@@ -452,10 +473,6 @@
{
LocalizedString descriptionLS = portlet.getInfo().getMeta().getMetaValue(MetaInfo.DESCRIPTION);
LocalizedString displayNameLS = portlet.getInfo().getMeta().getMetaValue(MetaInfo.DISPLAY_NAME);
-
- // julien: ????
- // getLocalizedStringValue(descriptionLS, portletName);
-
ContentType<?> contentType;
String contentId;
if (portlet.isRemote())
@@ -469,7 +486,6 @@
contentId = info.getApplicationName() + "/" + info.getName();
}
-
//
app = category.createContent(portletName, contentType, contentId);
app.setDisplayName(getLocalizedStringValue(displayNameLS, portletName));
Modified: portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml
===================================================================
--- portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2010-02-17 09:19:22 UTC (rev 1769)
+++ portal/trunk/portlet/exoadmin/src/main/webapp/WEB-INF/portlet.xml 2010-02-17 13:52:56 UTC (rev 1770)
@@ -240,7 +240,7 @@
<portlet-info>
<title>Administration Toolbar Portlet</title>
<short-title>Administration Toolbar</short-title>
- <keywords>System</keywords>
+ <keywords>gatein_internal</keywords>
</portlet-info>
</portlet>
@@ -265,7 +265,7 @@
<portlet-info>
<title>User Info Portlet</title>
<short-title>UserInfo</short-title>
- <keywords>System, UserInfo</keywords>
+ <keywords>gatein_internal</keywords>
</portlet-info>
<security-role-ref>
@@ -295,7 +295,7 @@
<portlet-info>
<title>User Toolbar Site Portlet</title>
<short-title>UserToolbarSite</short-title>
- <keywords>System</keywords>
+ <keywords>gatein_internal</keywords>
</portlet-info>
<security-role-ref>
@@ -325,7 +325,7 @@
<portlet-info>
<title>User Toolbar Dashboard Portlet</title>
<short-title>UserToolbarDashboard</short-title>
- <keywords>System</keywords>
+ <keywords>gatein_internal</keywords>
</portlet-info>
<security-role-ref>
@@ -355,7 +355,7 @@
<portlet-info>
<title>User Toolbar Group Portlet</title>
<short-title>UserToolbarGroup</short-title>
- <keywords>System</keywords>
+ <keywords>gatein_internal</keywords>
</portlet-info>
<security-role-ref>
@@ -384,7 +384,7 @@
<portlet-info>
<title>Star Toolbar Portlet</title>
<short-title>Star Toolbar</short-title>
- <keywords>System</keywords>
+ <keywords>gatein_internal</keywords>
</portlet-info>
</portlet>
14 years, 10 months
- 1
- 0
gatein SVN: r1769 - portal/branches.
by do-not-reply＠jboss.org
Author: mpodolin
Date: 2010-02-17 04:19:22 -0500 (Wed, 17 Feb 2010)
New Revision: 1769
Added:
portal/branches/EPP_5_0_0_ER03_Branch/
Log:
Creating a branch of tag 3.0.0-CR01
Copied: portal/branches/EPP_5_0_0_ER03_Branch (from rev 1768, portal/tags/3.0.0-CR01)
14 years, 10 months
- 1
- 0
gatein SVN: r1768 - in components/sso/trunk: agent and 11 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-16 17:19:37 -0500 (Tue, 16 Feb 2010)
New Revision: 1768
Modified:
components/sso/trunk/agent/pom.xml
components/sso/trunk/auth-callback/pom.xml
components/sso/trunk/cas/gatein-cas-plugin/pom.xml
components/sso/trunk/cas/gatein-cas-portal/pom.xml
components/sso/trunk/cas/pom.xml
components/sso/trunk/josso/gatein-josso-plugin/pom.xml
components/sso/trunk/josso/gatein-josso-portal/pom.xml
components/sso/trunk/josso/pom.xml
components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml
components/sso/trunk/opensso/gatein-opensso-portal/pom.xml
components/sso/trunk/opensso/pom.xml
components/sso/trunk/packaging/pom.xml
components/sso/trunk/pom.xml
Log:
[maven-release-plugin] prepare for next development iteration
Modified: components/sso/trunk/agent/pom.xml
===================================================================
--- components/sso/trunk/agent/pom.xml 2010-02-16 22:18:47 UTC (rev 1767)
+++ components/sso/trunk/agent/pom.xml 2010-02-16 22:19:37 UTC (rev 1768)
@@ -3,7 +3,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -121,37 +121,27 @@
<groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
<artifactId>maven-antrun-extended-plugin</artifactId> <executions>
<execution> <id>josso-agent-package</id> <phase>package</phase>
- <configuration> <tasks> <echo message="Preparing the JOSSO Agent for GateIn" /> <delete dir="${basedir}/target/josso" /> <mkdir dir="${basedir}/target/josso" /> <unjar src="${settings.localRepository}/org/exoplatform/portal/exo.portal.web.portal/${org.exoplatform.portal.version}/exo.portal.web.portal-${org.exoplatform.portal.version}.war"
- dest="${basedir}/target/josso/portal.war" overwrite="true" /> <copy todir="${basedir}/target/josso/portal.war" overwrite="true"> <fileset dir="${basedir}/src/main/config/josso/portal.war" /> </copy> <jar destfile="${basedir}/target/josso/02portal.war"
- basedir="${basedir}/target/josso/portal.war" /> </tasks>
+ <configuration> <tasks> <echo message="Preparing the JOSSO Agent for GateIn" /> <delete dir="${basedir}/target/josso" /> <mkdir dir="${basedir}/target/josso" /> <unjar src="${settings.localRepository}/org/exoplatform/portal/exo.portal.web.portal/${org.exoplatform.portal.version}/exo.portal.web.portal-${org.exoplatform.portal.version}.war" dest="${basedir}/target/josso/portal.war" overwrite="true" /> <copy todir="${basedir}/target/josso/portal.war" overwrite="true"> <fileset dir="${basedir}/src/main/config/josso/portal.war" /> </copy> <jar destfile="${basedir}/target/josso/02portal.war" basedir="${basedir}/target/josso/portal.war" /> </tasks>
</configuration> <goals> <goal>run</goal> </goals> </execution>
<execution> <id>josso-agent-install</id> <phase>install</phase>
- <configuration> <tasks> <echo message="Deploying the JOSSO Agent for GateIn" /> <copy file="${basedir}/target/josso/02portal.war" todir="${gatein.location}/deploy/gatein.ear" overwrite="true" /> <copy file="${settings.localRepository}/org/gatein/sso/auth-callback/${project.version}/auth-callback-${project.version}.jar"
- todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
+ <configuration> <tasks> <echo message="Deploying the JOSSO Agent for GateIn" /> <copy file="${basedir}/target/josso/02portal.war" todir="${gatein.location}/deploy/gatein.ear" overwrite="true" /> <copy file="${settings.localRepository}/org/gatein/sso/auth-callback/${project.version}/auth-callback-${project.version}.jar" todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
- <copy file="${settings.localRepository}/org/gatein/sso/agent/${project.version}/agent-${project.version}.jar"
- todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
+ <copy file="${settings.localRepository}/org/gatein/sso/agent/${project.version}/agent-${project.version}.jar" todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
- <copy file="${settings.localRepository}/org/josso/josso-agent/${version.josso}/josso-agent-${version.josso}.jar"
- todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
+ <copy file="${settings.localRepository}/org/josso/josso-agent/${version.josso}/josso-agent-${version.josso}.jar" todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
- <copy file="${settings.localRepository}/org/josso/josso-servlet-agent/${version.josso}/josso-servlet-agent-${version.josso}.jar"
- todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
+ <copy file="${settings.localRepository}/org/josso/josso-servlet-agent/${version.josso}/josso-servlet-agent-${version.josso}.jar" todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
- <copy file="${settings.localRepository}/org/josso/josso-agent-shared/${version.josso}/josso-agent-shared-${version.josso}.jar"
- todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
+ <copy file="${settings.localRepository}/org/josso/josso-agent-shared/${version.josso}/josso-agent-shared-${version.josso}.jar" todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
- <copy file="${settings.localRepository}/org/josso/josso-protocol-client/${version.josso}/josso-protocol-client-${version.josso}.jar"
- todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
+ <copy file="${settings.localRepository}/org/josso/josso-protocol-client/${version.josso}/josso-protocol-client-${version.josso}.jar" todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
- <copy file="${settings.localRepository}/org/josso/josso-common/${version.josso}/josso-common-${version.josso}.jar"
- todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
+ <copy file="${settings.localRepository}/org/josso/josso-common/${version.josso}/josso-common-${version.josso}.jar" todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
- <copy file="${settings.localRepository}/org/josso/josso-core/${version.josso}/josso-core-${version.josso}.jar"
- todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
+ <copy file="${settings.localRepository}/org/josso/josso-core/${version.josso}/josso-core-${version.josso}.jar" todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
</tasks> </configuration> <goals> <goal>run</goal> </goals>
</execution> </executions> </plugin> </plugins> </build> </profile>
-->
Modified: components/sso/trunk/auth-callback/pom.xml
===================================================================
--- components/sso/trunk/auth-callback/pom.xml 2010-02-16 22:18:47 UTC (rev 1767)
+++ components/sso/trunk/auth-callback/pom.xml 2010-02-16 22:19:37 UTC (rev 1768)
@@ -3,7 +3,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/cas/gatein-cas-plugin/pom.xml
===================================================================
--- components/sso/trunk/cas/gatein-cas-plugin/pom.xml 2010-02-16 22:18:47 UTC (rev 1767)
+++ components/sso/trunk/cas/gatein-cas-plugin/pom.xml 2010-02-16 22:19:37 UTC (rev 1768)
@@ -3,7 +3,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-cas-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/cas/gatein-cas-portal/pom.xml
===================================================================
--- components/sso/trunk/cas/gatein-cas-portal/pom.xml 2010-02-16 22:18:47 UTC (rev 1767)
+++ components/sso/trunk/cas/gatein-cas-portal/pom.xml 2010-02-16 22:19:37 UTC (rev 1768)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-cas-parent</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-cas-plugin</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
@@ -23,12 +23,12 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-agent</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-auth-callback</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jasig.cas</groupId>
Modified: components/sso/trunk/cas/pom.xml
===================================================================
--- components/sso/trunk/cas/pom.xml 2010-02-16 22:18:47 UTC (rev 1767)
+++ components/sso/trunk/cas/pom.xml 2010-02-16 22:19:37 UTC (rev 1768)
@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-cas-parent</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</parent>
<name>GateIn SSO - CAS</name>
Modified: components/sso/trunk/josso/gatein-josso-plugin/pom.xml
===================================================================
--- components/sso/trunk/josso/gatein-josso-plugin/pom.xml 2010-02-16 22:18:47 UTC (rev 1767)
+++ components/sso/trunk/josso/gatein-josso-plugin/pom.xml 2010-02-16 22:19:37 UTC (rev 1768)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-josso-parent</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -65,15 +65,11 @@
<groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
<artifactId>maven-antrun-extended-plugin</artifactId> <executions>
<execution> <id>plugin-tomcat-package</id> <phase>package</phase>
- <configuration> <tasks> <echo message="Preparing the JOSSO Plugin for Tomcat 6.0.2......" /> <delete dir="${basedir}/target/plugin" /> <mkdir dir="${basedir}/target/plugin" /> <copy todir="${basedir}/target/plugin/lib"> <fileset dir="${basedir}/src/main/config"> <include name="josso-gateway-*.xml" /> </fileset> </copy> <copy todir="${basedir}/target/plugin/webapps/josso/WEB-INF"> <fileset dir="${basedir}/src/main/config/WEB-INF" /> </copy> <copy tofile="${basedir}/target/plugin/webapps/josso/WEB-INF/lib/gatein-josso-plugin.jar"
- file="${basedir}/target/gatein-josso-plugin-${project.version}.jar"
- overwrite="true" /> <copy tofile="${basedir}/target/plugin/webapps/josso/WEB-INF/lib/log4j.jar"
- file="${settings.localRepository}/apache-log4j/log4j/${version.log4j}/log4j-${version.log4j}.jar"
+ <configuration> <tasks> <echo message="Preparing the JOSSO Plugin for Tomcat 6.0.2......" /> <delete dir="${basedir}/target/plugin" /> <mkdir dir="${basedir}/target/plugin" /> <copy todir="${basedir}/target/plugin/lib"> <fileset dir="${basedir}/src/main/config"> <include name="josso-gateway-*.xml" /> </fileset> </copy> <copy todir="${basedir}/target/plugin/webapps/josso/WEB-INF"> <fileset dir="${basedir}/src/main/config/WEB-INF" /> </copy> <copy tofile="${basedir}/target/plugin/webapps/josso/WEB-INF/lib/gatein-josso-plugin.jar" file="${basedir}/target/gatein-josso-plugin-${project.version}.jar"
+ overwrite="true" /> <copy tofile="${basedir}/target/plugin/webapps/josso/WEB-INF/lib/log4j.jar" file="${settings.localRepository}/apache-log4j/log4j/${version.log4j}/log4j-${version.log4j}.jar"
overwrite="true" /> </tasks> </configuration> <goals> <goal>run</goal>
</goals> </execution> <execution> <id>plugin-tomcat-install</id>
- <phase>install</phase> <configuration> <tasks> <echo message="Starting JOSSO Plugin Deployment into Tomcat 6.0.2......" /> <jar destfile="${basedir}/target/plugin.jar"
- basedir="${basedir}/target/plugin" /> <unjar src="${basedir}/target/plugin.jar" dest="${tomcat60.josso.location}"
- overwrite="true" /> <delete dir="${tomcat60.josso.location}/META-INF" />
+ <phase>install</phase> <configuration> <tasks> <echo message="Starting JOSSO Plugin Deployment into Tomcat 6.0.2......" /> <jar destfile="${basedir}/target/plugin.jar" basedir="${basedir}/target/plugin" /> <unjar src="${basedir}/target/plugin.jar" dest="${tomcat60.josso.location}" overwrite="true" /> <delete dir="${tomcat60.josso.location}/META-INF" />
</tasks> </configuration> <goals> <goal>run</goal> </goals>
</execution> </executions> </plugin> </plugins> </build> </profile>
</profiles>
Modified: components/sso/trunk/josso/gatein-josso-portal/pom.xml
===================================================================
--- components/sso/trunk/josso/gatein-josso-portal/pom.xml 2010-02-16 22:18:47 UTC (rev 1767)
+++ components/sso/trunk/josso/gatein-josso-portal/pom.xml 2010-02-16 22:19:37 UTC (rev 1768)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-josso-parent</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -54,12 +54,12 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-agent</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-auth-callback</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</dependency>
<dependency>
@@ -74,7 +74,7 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-josso-plugin</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>apache-log4j</groupId>
Modified: components/sso/trunk/josso/pom.xml
===================================================================
--- components/sso/trunk/josso/pom.xml 2010-02-16 22:18:47 UTC (rev 1767)
+++ components/sso/trunk/josso/pom.xml 2010-02-16 22:19:37 UTC (rev 1768)
@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-josso-parent</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</parent>
Modified: components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml
===================================================================
--- components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml 2010-02-16 22:18:47 UTC (rev 1767)
+++ components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml 2010-02-16 22:19:37 UTC (rev 1768)
@@ -3,7 +3,7 @@
<groupId>org.gatein.sso</groupId>
<artifactId>sso-opensso-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/opensso/gatein-opensso-portal/pom.xml
===================================================================
--- components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2010-02-16 22:18:47 UTC (rev 1767)
+++ components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2010-02-16 22:19:37 UTC (rev 1768)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-opensso-parent</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -14,7 +14,7 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-opensso-plugin</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
@@ -28,12 +28,12 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-agent</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-auth-callback</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</dependency>
</dependencies>
Modified: components/sso/trunk/opensso/pom.xml
===================================================================
--- components/sso/trunk/opensso/pom.xml 2010-02-16 22:18:47 UTC (rev 1767)
+++ components/sso/trunk/opensso/pom.xml 2010-02-16 22:19:37 UTC (rev 1768)
@@ -3,13 +3,13 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-opensso-parent</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</parent>
Modified: components/sso/trunk/packaging/pom.xml
===================================================================
--- components/sso/trunk/packaging/pom.xml 2010-02-16 22:18:47 UTC (rev 1767)
+++ components/sso/trunk/packaging/pom.xml 2010-02-16 22:19:37 UTC (rev 1768)
@@ -2,7 +2,7 @@
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/pom.xml
===================================================================
--- components/sso/trunk/pom.xml 2010-02-16 22:18:47 UTC (rev 1767)
+++ components/sso/trunk/pom.xml 2010-02-16 22:19:37 UTC (rev 1768)
@@ -10,7 +10,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>1.0.0-Beta01</version>
+ <version>1.0.0-Beta02-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>
@@ -25,9 +25,9 @@
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/sso/tags/1.0.0-B...</connection>
- <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/sso/tags/1.0.0-Beta01</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/sso/tags/1.0.0-Beta01</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/sso/trunk</connection>
+ <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/sso/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/sso/trunk</url>
</scm>
14 years, 10 months
- 1
- 0
gatein SVN: r1767 - components/sso/tags.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-16 17:18:47 -0500 (Tue, 16 Feb 2010)
New Revision: 1767
Added:
components/sso/tags/1.0.0-Beta01/
Log:
[maven-scm] copy for tag 1.0.0-Beta01
Copied: components/sso/tags/1.0.0-Beta01 (from rev 1766, components/sso/trunk)
14 years, 10 months
- 1
- 0
gatein SVN: r1766 - components/sso.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-16 17:17:29 -0500 (Tue, 16 Feb 2010)
New Revision: 1766
Added:
components/sso/tags/
Log:
Adding tags directory
14 years, 10 months
- 1
- 0
gatein SVN: r1765 - in components/sso/trunk: agent and 11 other directories.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-16 17:16:00 -0500 (Tue, 16 Feb 2010)
New Revision: 1765
Modified:
components/sso/trunk/agent/pom.xml
components/sso/trunk/auth-callback/pom.xml
components/sso/trunk/cas/gatein-cas-plugin/pom.xml
components/sso/trunk/cas/gatein-cas-portal/pom.xml
components/sso/trunk/cas/pom.xml
components/sso/trunk/josso/gatein-josso-plugin/pom.xml
components/sso/trunk/josso/gatein-josso-portal/pom.xml
components/sso/trunk/josso/pom.xml
components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml
components/sso/trunk/opensso/gatein-opensso-portal/pom.xml
components/sso/trunk/opensso/pom.xml
components/sso/trunk/packaging/pom.xml
components/sso/trunk/pom.xml
Log:
[maven-release-plugin] prepare release 1.0.0-Beta01
Modified: components/sso/trunk/agent/pom.xml
===================================================================
--- components/sso/trunk/agent/pom.xml 2010-02-16 22:12:36 UTC (rev 1764)
+++ components/sso/trunk/agent/pom.xml 2010-02-16 22:16:00 UTC (rev 1765)
@@ -1,10 +1,9 @@
-<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">
+<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">
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -122,53 +121,37 @@
<groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
<artifactId>maven-antrun-extended-plugin</artifactId> <executions>
<execution> <id>josso-agent-package</id> <phase>package</phase>
- <configuration> <tasks> <echo message="Preparing the JOSSO Agent for
- GateIn"/> <delete dir="${basedir}/target/josso"/> <mkdir
- dir="${basedir}/target/josso"/> <unjar
- src="${settings.localRepository}/org/exoplatform/portal/exo.portal.web.portal/${org.exoplatform.portal.version}/exo.portal.web.portal-${org.exoplatform.portal.version}.war"
- dest="${basedir}/target/josso/portal.war" overwrite="true"/> <copy
- todir="${basedir}/target/josso/portal.war" overwrite="true"> <fileset
- dir="${basedir}/src/main/config/josso/portal.war"/> </copy> <jar
- destfile="${basedir}/target/josso/02portal.war"
- basedir="${basedir}/target/josso/portal.war"/> </tasks>
+ <configuration> <tasks> <echo message="Preparing the JOSSO Agent for GateIn" /> <delete dir="${basedir}/target/josso" /> <mkdir dir="${basedir}/target/josso" /> <unjar src="${settings.localRepository}/org/exoplatform/portal/exo.portal.web.portal/${org.exoplatform.portal.version}/exo.portal.web.portal-${org.exoplatform.portal.version}.war"
+ dest="${basedir}/target/josso/portal.war" overwrite="true" /> <copy todir="${basedir}/target/josso/portal.war" overwrite="true"> <fileset dir="${basedir}/src/main/config/josso/portal.war" /> </copy> <jar destfile="${basedir}/target/josso/02portal.war"
+ basedir="${basedir}/target/josso/portal.war" /> </tasks>
</configuration> <goals> <goal>run</goal> </goals> </execution>
<execution> <id>josso-agent-install</id> <phase>install</phase>
- <configuration> <tasks> <echo message="Deploying the JOSSO Agent for
- GateIn"/> <copy file="${basedir}/target/josso/02portal.war"
- todir="${gatein.location}/deploy/gatein.ear" overwrite="true"/> <copy
- file="${settings.localRepository}/org/gatein/sso/auth-callback/${project.version}/auth-callback-${project.version}.jar"
- todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true"/>
+ <configuration> <tasks> <echo message="Deploying the JOSSO Agent for GateIn" /> <copy file="${basedir}/target/josso/02portal.war" todir="${gatein.location}/deploy/gatein.ear" overwrite="true" /> <copy file="${settings.localRepository}/org/gatein/sso/auth-callback/${project.version}/auth-callback-${project.version}.jar"
+ todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
- <copy
- file="${settings.localRepository}/org/gatein/sso/agent/${project.version}/agent-${project.version}.jar"
- todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true"/>
+ <copy file="${settings.localRepository}/org/gatein/sso/agent/${project.version}/agent-${project.version}.jar"
+ todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
- <copy
- file="${settings.localRepository}/org/josso/josso-agent/${version.josso}/josso-agent-${version.josso}.jar"
- todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true"/>
+ <copy file="${settings.localRepository}/org/josso/josso-agent/${version.josso}/josso-agent-${version.josso}.jar"
+ todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
- <copy
- file="${settings.localRepository}/org/josso/josso-servlet-agent/${version.josso}/josso-servlet-agent-${version.josso}.jar"
- todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true"/>
+ <copy file="${settings.localRepository}/org/josso/josso-servlet-agent/${version.josso}/josso-servlet-agent-${version.josso}.jar"
+ todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
- <copy
- file="${settings.localRepository}/org/josso/josso-agent-shared/${version.josso}/josso-agent-shared-${version.josso}.jar"
- todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true"/>
+ <copy file="${settings.localRepository}/org/josso/josso-agent-shared/${version.josso}/josso-agent-shared-${version.josso}.jar"
+ todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
- <copy
- file="${settings.localRepository}/org/josso/josso-protocol-client/${version.josso}/josso-protocol-client-${version.josso}.jar"
- todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true"/>
+ <copy file="${settings.localRepository}/org/josso/josso-protocol-client/${version.josso}/josso-protocol-client-${version.josso}.jar"
+ todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
- <copy
- file="${settings.localRepository}/org/josso/josso-common/${version.josso}/josso-common-${version.josso}.jar"
- todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true"/>
+ <copy file="${settings.localRepository}/org/josso/josso-common/${version.josso}/josso-common-${version.josso}.jar"
+ todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
- <copy
- file="${settings.localRepository}/org/josso/josso-core/${version.josso}/josso-core-${version.josso}.jar"
- todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true"/>
+ <copy file="${settings.localRepository}/org/josso/josso-core/${version.josso}/josso-core-${version.josso}.jar"
+ todir="${gatein.location}/deploy/gatein.ear/lib" overwrite="true" />
</tasks> </configuration> <goals> <goal>run</goal> </goals>
</execution> </executions> </plugin> </plugins> </build> </profile>
-->
Modified: components/sso/trunk/auth-callback/pom.xml
===================================================================
--- components/sso/trunk/auth-callback/pom.xml 2010-02-16 22:12:36 UTC (rev 1764)
+++ components/sso/trunk/auth-callback/pom.xml 2010-02-16 22:16:00 UTC (rev 1765)
@@ -1,10 +1,9 @@
-<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">
+<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">
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/cas/gatein-cas-plugin/pom.xml
===================================================================
--- components/sso/trunk/cas/gatein-cas-plugin/pom.xml 2010-02-16 22:12:36 UTC (rev 1764)
+++ components/sso/trunk/cas/gatein-cas-plugin/pom.xml 2010-02-16 22:16:00 UTC (rev 1765)
@@ -1,10 +1,9 @@
-<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">
+<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">
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-cas-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/cas/gatein-cas-portal/pom.xml
===================================================================
--- components/sso/trunk/cas/gatein-cas-portal/pom.xml 2010-02-16 22:12:36 UTC (rev 1764)
+++ components/sso/trunk/cas/gatein-cas-portal/pom.xml 2010-02-16 22:16:00 UTC (rev 1765)
@@ -1,9 +1,8 @@
-<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">
+<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">
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-cas-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -15,7 +14,7 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-cas-plugin</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
@@ -24,12 +23,12 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-agent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</dependency>
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-auth-callback</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</dependency>
<dependency>
<groupId>org.jasig.cas</groupId>
Modified: components/sso/trunk/cas/pom.xml
===================================================================
--- components/sso/trunk/cas/pom.xml 2010-02-16 22:12:36 UTC (rev 1764)
+++ components/sso/trunk/cas/pom.xml 2010-02-16 22:16:00 UTC (rev 1765)
@@ -1,16 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-cas-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
<packaging>pom</packaging>
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</parent>
<name>GateIn SSO - CAS</name>
Modified: components/sso/trunk/josso/gatein-josso-plugin/pom.xml
===================================================================
--- components/sso/trunk/josso/gatein-josso-plugin/pom.xml 2010-02-16 22:12:36 UTC (rev 1764)
+++ components/sso/trunk/josso/gatein-josso-plugin/pom.xml 2010-02-16 22:16:00 UTC (rev 1765)
@@ -1,9 +1,8 @@
-<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">
+<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">
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-josso-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -66,27 +65,15 @@
<groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
<artifactId>maven-antrun-extended-plugin</artifactId> <executions>
<execution> <id>plugin-tomcat-package</id> <phase>package</phase>
- <configuration> <tasks> <echo message="Preparing the JOSSO Plugin for
- Tomcat 6.0.2......"/> <delete dir="${basedir}/target/plugin"/> <mkdir
- dir="${basedir}/target/plugin"/> <copy
- todir="${basedir}/target/plugin/lib"> <fileset
- dir="${basedir}/src/main/config"> <include
- name="josso-gateway-*.xml"/> </fileset> </copy> <copy
- todir="${basedir}/target/plugin/webapps/josso/WEB-INF"> <fileset
- dir="${basedir}/src/main/config/WEB-INF"/> </copy> <copy
- tofile="${basedir}/target/plugin/webapps/josso/WEB-INF/lib/gatein-josso-plugin.jar"
+ <configuration> <tasks> <echo message="Preparing the JOSSO Plugin for Tomcat 6.0.2......" /> <delete dir="${basedir}/target/plugin" /> <mkdir dir="${basedir}/target/plugin" /> <copy todir="${basedir}/target/plugin/lib"> <fileset dir="${basedir}/src/main/config"> <include name="josso-gateway-*.xml" /> </fileset> </copy> <copy todir="${basedir}/target/plugin/webapps/josso/WEB-INF"> <fileset dir="${basedir}/src/main/config/WEB-INF" /> </copy> <copy tofile="${basedir}/target/plugin/webapps/josso/WEB-INF/lib/gatein-josso-plugin.jar"
file="${basedir}/target/gatein-josso-plugin-${project.version}.jar"
- overwrite="true"/> <copy
- tofile="${basedir}/target/plugin/webapps/josso/WEB-INF/lib/log4j.jar"
+ overwrite="true" /> <copy tofile="${basedir}/target/plugin/webapps/josso/WEB-INF/lib/log4j.jar"
file="${settings.localRepository}/apache-log4j/log4j/${version.log4j}/log4j-${version.log4j}.jar"
- overwrite="true"/> </tasks> </configuration> <goals> <goal>run</goal>
+ overwrite="true" /> </tasks> </configuration> <goals> <goal>run</goal>
</goals> </execution> <execution> <id>plugin-tomcat-install</id>
- <phase>install</phase> <configuration> <tasks> <echo message="Starting
- JOSSO Plugin Deployment into Tomcat 6.0.2......"/> <jar
- destfile="${basedir}/target/plugin.jar"
- basedir="${basedir}/target/plugin"/> <unjar
- src="${basedir}/target/plugin.jar" dest="${tomcat60.josso.location}"
- overwrite="true"/> <delete dir="${tomcat60.josso.location}/META-INF"/>
+ <phase>install</phase> <configuration> <tasks> <echo message="Starting JOSSO Plugin Deployment into Tomcat 6.0.2......" /> <jar destfile="${basedir}/target/plugin.jar"
+ basedir="${basedir}/target/plugin" /> <unjar src="${basedir}/target/plugin.jar" dest="${tomcat60.josso.location}"
+ overwrite="true" /> <delete dir="${tomcat60.josso.location}/META-INF" />
</tasks> </configuration> <goals> <goal>run</goal> </goals>
</execution> </executions> </plugin> </plugins> </build> </profile>
</profiles>
Modified: components/sso/trunk/josso/gatein-josso-portal/pom.xml
===================================================================
--- components/sso/trunk/josso/gatein-josso-portal/pom.xml 2010-02-16 22:12:36 UTC (rev 1764)
+++ components/sso/trunk/josso/gatein-josso-portal/pom.xml 2010-02-16 22:16:00 UTC (rev 1765)
@@ -1,9 +1,8 @@
-<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">
+<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">
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-josso-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -55,12 +54,12 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-agent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</dependency>
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-auth-callback</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</dependency>
<dependency>
@@ -75,7 +74,7 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-josso-plugin</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</dependency>
<dependency>
<groupId>apache-log4j</groupId>
Modified: components/sso/trunk/josso/pom.xml
===================================================================
--- components/sso/trunk/josso/pom.xml 2010-02-16 22:12:36 UTC (rev 1764)
+++ components/sso/trunk/josso/pom.xml 2010-02-16 22:16:00 UTC (rev 1765)
@@ -1,16 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-josso-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
<packaging>pom</packaging>
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</parent>
Modified: components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml
===================================================================
--- components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml 2010-02-16 22:12:36 UTC (rev 1764)
+++ components/sso/trunk/opensso/gatein-opensso-plugin/pom.xml 2010-02-16 22:16:00 UTC (rev 1765)
@@ -1,10 +1,9 @@
-<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">
+<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">
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-opensso-parent</artifactId>
<relativePath>../pom.xml</relativePath>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/opensso/gatein-opensso-portal/pom.xml
===================================================================
--- components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2010-02-16 22:12:36 UTC (rev 1764)
+++ components/sso/trunk/opensso/gatein-opensso-portal/pom.xml 2010-02-16 22:16:00 UTC (rev 1765)
@@ -1,9 +1,8 @@
-<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">
+<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">
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-opensso-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -15,7 +14,7 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-opensso-plugin</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</dependency>
<dependency>
<groupId>commons-httpclient</groupId>
@@ -29,12 +28,12 @@
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-agent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</dependency>
<dependency>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-auth-callback</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</dependency>
</dependencies>
Modified: components/sso/trunk/opensso/pom.xml
===================================================================
--- components/sso/trunk/opensso/pom.xml 2010-02-16 22:12:36 UTC (rev 1764)
+++ components/sso/trunk/opensso/pom.xml 2010-02-16 22:16:00 UTC (rev 1765)
@@ -1,16 +1,15 @@
<?xml version="1.0" encoding="UTF-8"?>
-<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">
+<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>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-opensso-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
<packaging>pom</packaging>
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</parent>
Modified: components/sso/trunk/packaging/pom.xml
===================================================================
--- components/sso/trunk/packaging/pom.xml 2010-02-16 22:12:36 UTC (rev 1764)
+++ components/sso/trunk/packaging/pom.xml 2010-02-16 22:16:00 UTC (rev 1765)
@@ -1,9 +1,8 @@
-<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">
+<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">
<parent>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: components/sso/trunk/pom.xml
===================================================================
--- components/sso/trunk/pom.xml 2010-02-16 22:12:36 UTC (rev 1764)
+++ components/sso/trunk/pom.xml 2010-02-16 22:16:00 UTC (rev 1765)
@@ -6,12 +6,11 @@
property for the specific version - add a dependency in the
dependencyManagement section which refers to the property
-->
-<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">
+<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>
<groupId>org.gatein.sso</groupId>
<artifactId>sso-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.0.0-Beta01</version>
<packaging>pom</packaging>
<parent>
@@ -26,9 +25,9 @@
<scm>
- <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/sso/trunk</connection>
- <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/sso/trunk</developerConnection>
- <url>http://fisheye.jboss.org/browse/gatein/components/sso/trunk</url>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/sso/tags/1.0.0-B...</connection>
+ <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/sso/tags/1.0.0-Beta01</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/sso/tags/1.0.0-Beta01</url>
</scm>
14 years, 10 months
- 1
- 0
gatein SVN: r1764 - components/sso/trunk.
by do-not-reply＠jboss.org
Author: thomas.heute(a)jboss.com
Date: 2010-02-16 17:12:36 -0500 (Tue, 16 Feb 2010)
New Revision: 1764
Modified:
components/sso/trunk/pom.xml
Log:
Adding SCM info
Modified: components/sso/trunk/pom.xml
===================================================================
--- components/sso/trunk/pom.xml 2010-02-16 22:09:22 UTC (rev 1763)
+++ components/sso/trunk/pom.xml 2010-02-16 22:12:36 UTC (rev 1764)
@@ -24,6 +24,14 @@
<name>GateIn SSO</name>
<description>GateIn Single Sign On Integration</description>
+
+ <scm>
+ <connection>scm:svn:http://anonsvn.jboss.org/repos/gatein/components/sso/trunk</connection>
+ <developerConnection>scm:svn:http://svn.jboss.org/repos/gatein/components/sso/trunk</developerConnection>
+ <url>http://fisheye.jboss.org/browse/gatein/components/sso/trunk</url>
+ </scm>
+
+
<modules>
<module>agent</module>
<module>auth-callback</module>
14 years, 10 months
- 1
- 0