JBoss Portal SVN: r13629 - in modules/authorization/trunk: core-components-api/src/main/java/org/jboss/security/authz/components/subject and 3 other directories.
by portal-commits＠lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-07-29 16:01:36 -0400 (Wed, 29 Jul 2009)
New Revision: 13629
Added:
modules/authorization/trunk/agent/src/test/java/org/jboss/security/authz/agent/test/AbstractTest.java
modules/authorization/trunk/agent/src/test/java/org/jboss/security/authz/agent/test/TestMultiPolicyStore.java
Modified:
modules/authorization/trunk/core-components-api/src/main/java/org/jboss/security/authz/components/subject/Roles.java
modules/authorization/trunk/core-components-api/src/test/java/org/jboss/security/authz/components/subject/TestRolesDroolsRules.java
modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/components/TestURLPattern.java
modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/plugin/DroolsFunction.java
Log:
exo-integration inspired bug fixes
* Roles component Drools expression needed fixing
* Testing for MultiPolicy scenarios...more needed
Added: modules/authorization/trunk/agent/src/test/java/org/jboss/security/authz/agent/test/AbstractTest.java
===================================================================
--- modules/authorization/trunk/agent/src/test/java/org/jboss/security/authz/agent/test/AbstractTest.java (rev 0)
+++ modules/authorization/trunk/agent/src/test/java/org/jboss/security/authz/agent/test/AbstractTest.java 2009-07-29 20:01:36 UTC (rev 13629)
@@ -0,0 +1,81 @@
+/**
+ *
+ */
+package org.jboss.security.authz.agent.test;
+
+import java.net.URI;
+
+import junit.framework.TestCase;
+import org.apache.log4j.Logger;
+
+import org.jboss.security.authz.bootstrap.ServiceContainer;
+
+import org.jboss.security.authz.components.resource.URIResource;
+import org.jboss.security.authz.components.subject.Identity;
+import org.jboss.security.authz.components.subject.Roles;
+import org.jboss.security.authz.components.action.Read;
+
+import org.jboss.security.authz.model.Effect;
+import org.jboss.security.authz.model.Policy;
+import org.jboss.security.authz.model.PolicyMetaData;
+
+import org.jboss.security.authz.agent.enforcement.PolicyEnforcementPoint;
+import org.jboss.security.authz.agent.enforcement.EnforcementContext;
+import org.jboss.security.authz.agent.enforcement.EnforcementResponse;
+import org.jboss.security.authz.agent.provisioning.PolicyProvisioner;
+
+import org.jboss.security.authz.agent.services.CompositionContext;
+import org.jboss.security.authz.agent.services.PolicyComposer;
+
+/**
+ * @author soshah
+ *
+ */
+public abstract class AbstractTest extends TestCase
+{
+ private static Logger log = Logger.getLogger(AbstractTest.class);
+
+ protected PolicyComposer policyComposer;
+ protected PolicyEnforcementPoint enforcer;
+ protected PolicyProvisioner provisioner;
+
+ public void setUp() throws Exception
+ {
+ ServiceContainer.bootstrap();
+
+ this.policyComposer = (PolicyComposer)ServiceContainer.lookup("/agent/PolicyComposer");
+ this.enforcer = (PolicyEnforcementPoint)ServiceContainer.lookup("/agent/LocalEnforcementPoint");
+ this.provisioner = (PolicyProvisioner)ServiceContainer.lookup("/agent/LocalPolicyProvisioner");
+ }
+
+ protected void enforce(EnforcementContext enforcementContext, boolean mustBePermitted) throws Exception
+ {
+ EnforcementResponse response = this.enforcer.checkAccess(enforcementContext);
+
+ assertNotNull(response);
+ log.info("-----------------------------------");
+ log.info("Decision="+response.getMessage());
+
+ if(mustBePermitted)
+ {
+ assertTrue("Access must be granted!!!", response.isAccessGranted());
+ }
+ else
+ {
+ assertFalse("Access must be denied!!!", response.isAccessGranted());
+ }
+ }
+
+ protected void assertServerState() throws Exception
+ {
+ //Assert Policy State of the Server
+ Policy[] policies = this.provisioner.readAllPolicies();
+
+ assertTrue("Policy Store must not be empty!!", (policies != null && policies.length >0));
+ log.info("------------------------------------------------------------------------------");
+ for(Policy policy: policies)
+ {
+ log.info(policy.generateSystemPolicy());
+ }
+ }
+}
Added: modules/authorization/trunk/agent/src/test/java/org/jboss/security/authz/agent/test/TestMultiPolicyStore.java
===================================================================
--- modules/authorization/trunk/agent/src/test/java/org/jboss/security/authz/agent/test/TestMultiPolicyStore.java (rev 0)
+++ modules/authorization/trunk/agent/src/test/java/org/jboss/security/authz/agent/test/TestMultiPolicyStore.java 2009-07-29 20:01:36 UTC (rev 13629)
@@ -0,0 +1,99 @@
+/**
+ *
+ */
+package org.jboss.security.authz.agent.test;
+
+import java.net.URI;
+
+import org.apache.log4j.Logger;
+import org.jboss.security.authz.agent.enforcement.EnforcementContext;
+import org.jboss.security.authz.agent.services.CompositionContext;
+import org.jboss.security.authz.components.action.Read;
+import org.jboss.security.authz.components.resource.URIResource;
+import org.jboss.security.authz.components.subject.Roles;
+import org.jboss.security.authz.components.subject.Identity;
+import org.jboss.security.authz.model.Effect;
+import org.jboss.security.authz.model.PolicyMetaData;
+
+/**
+ * @author soshah
+ *
+ */
+public class TestMultiPolicyStore extends AbstractTest
+{
+ private static Logger log = Logger.getLogger(TestMultiPolicyStore.class);
+
+ public void setUp() throws Exception
+ {
+ super.setUp();
+ this.provisionOnStartup();
+ }
+
+ public void testPolicyStoreInit() throws Exception
+ {
+ this.assertServerState();
+
+ //Perform Enforcement
+ this.enforce(this.createEnforcementContext("/blah0", new Read()), true);
+ this.enforce(this.createEnforcementContext("/blah1", new Read()), false);
+ }
+ //---------------------------------------------------------------------------------------------------------------------------------------------------------------
+ private void provisionOnStartup() throws Exception
+ {
+ for(int i=0; i<2; i++)
+ {
+ URIResource resource = new URIResource();
+ resource.setUri(new URI("/blah"+i));
+
+ Read action = new Read();
+
+ Identity identity = new Identity();
+ identity.setName("root");
+
+ Roles sysadmin = new Roles();
+ sysadmin.addName("sysadmin");
+
+
+ Roles allowedRoles = new Roles();
+ allowedRoles.addName("user");
+
+ //Setup the Context for the Composition with these components
+ CompositionContext context = new CompositionContext();
+ context.setPolicyTarget(resource);
+ if(i == 0)
+ {
+ context.addPolicyRule(Effect.PERMIT, action, allowedRoles, "allowExpression");
+ }
+ context.addPolicyRule(Effect.PERMIT, action, sysadmin, "allowExpression");
+ context.addPolicyRule(Effect.PERMIT, action, identity);
+
+ //Store the policy into the Policy Server
+ PolicyMetaData policyMetaData = this.policyComposer.compose(context);
+ this.provisioner.newPolicy(policyMetaData);
+ }
+ }
+
+ private EnforcementContext createEnforcementContext(String resource, Read action) throws Exception
+ {
+ // Create an EnforcementContext
+ EnforcementContext context = new EnforcementContext();
+
+ // Create Resource
+ URIResource protectedResource = new URIResource();
+ protectedResource.setUri(new URI(resource));
+ context.setAttribute("uri-resource", protectedResource);
+
+ // Create Subjects
+ Roles roles = new Roles();
+ roles.addName("user");
+ context.setAttribute("roles", roles);
+ Identity identity = new Identity();
+ identity.setName("blah(a)blah.com");
+ context.setAttribute("identity", identity);
+
+ // Create Action
+ context.setAttribute("action", action);
+
+ return context;
+ }
+}
Modified: modules/authorization/trunk/core-components-api/src/main/java/org/jboss/security/authz/components/subject/Roles.java
===================================================================
--- modules/authorization/trunk/core-components-api/src/main/java/org/jboss/security/authz/components/subject/Roles.java 2009-07-29 17:06:25 UTC (rev 13628)
+++ modules/authorization/trunk/core-components-api/src/main/java/org/jboss/security/authz/components/subject/Roles.java 2009-07-29 20:01:36 UTC (rev 13629)
@@ -52,25 +52,25 @@
public class Roles
{
//make it package-level access so that unit tests can test these rules
- static final String allowRule =
+ protected static final String allowRule =
"import java.util.HashSet\n"+
"rule \"{0}\"\n"+
"when\n"+
"$ruleName: String()\n"+
"$roles: HashSet()\n"+
- "eval($ruleName.contains(\"roles://allowRule\"))\n"+
+ "eval($ruleName.contains(\"{0}\"))\n"+
"eval({1})\n"+
"then\n"+
"insert(Boolean.TRUE);\n"+
"end\n";
- static final String denyRule =
+ protected static final String denyRule =
"import java.util.HashSet\n"+
"rule \"{0}\"\n"+
"when\n"+
"$ruleName: String()\n"+
"$roles: HashSet()\n"+
- "eval($ruleName.contains(\"roles://denyRule\"))\n"+
+ "eval($ruleName.contains(\"{0}\"))\n"+
"eval({1})\n"+
"then\n"+
"insert(Boolean.TRUE);\n"+
@@ -87,6 +87,8 @@
@SecurityContextData
private Set<String> names;
+ private boolean mustMatchAll=false;
+
public Roles()
{
@@ -119,6 +121,16 @@
{
return this.getNames().isEmpty();
}
+
+ public boolean isMustMatchAll()
+ {
+ return mustMatchAll;
+ }
+
+ public void setMustMatchAll(boolean mustMatchAll)
+ {
+ this.mustMatchAll = mustMatchAll;
+ }
//------------------------------------------------------------------------------------------------------------------------------------------------------------
/**
* Creates a Policy Rule suggesting the roles indicated by this object are permitted access to the 'Resource' designated in the Policy
@@ -135,7 +147,14 @@
StringBuffer buffer = new StringBuffer();
for(String role: this.getNames())
{
- buffer.append("$roles.contains(\""+role.toLowerCase()+"\") || ");
+ if(!this.mustMatchAll)
+ {
+ buffer.append("$roles.contains(\""+role.toLowerCase()+"\") || ");
+ }
+ else
+ {
+ buffer.append("$roles.contains(\""+role.toLowerCase()+"\") && ");
+ }
}
String condition = buffer.toString().trim();
String ruleLogic = MessageFormat.format(Roles.allowRule,
@@ -159,7 +178,14 @@
StringBuffer buffer = new StringBuffer();
for(String role: this.getNames())
{
- buffer.append("$roles.contains(\""+role.toLowerCase()+"\") || ");
+ if(!this.mustMatchAll)
+ {
+ buffer.append("$roles.contains(\""+role.toLowerCase()+"\") || ");
+ }
+ else
+ {
+ buffer.append("$roles.contains(\""+role.toLowerCase()+"\") && ");
+ }
}
String condition = buffer.toString().trim();
String ruleLogic = MessageFormat.format(Roles.denyRule,
Modified: modules/authorization/trunk/core-components-api/src/test/java/org/jboss/security/authz/components/subject/TestRolesDroolsRules.java
===================================================================
--- modules/authorization/trunk/core-components-api/src/test/java/org/jboss/security/authz/components/subject/TestRolesDroolsRules.java 2009-07-29 17:06:25 UTC (rev 13628)
+++ modules/authorization/trunk/core-components-api/src/test/java/org/jboss/security/authz/components/subject/TestRolesDroolsRules.java 2009-07-29 20:01:36 UTC (rev 13629)
@@ -54,9 +54,14 @@
"import org.jboss.security.xacml.interfaces.XACMLConstants;\n";
private RuleBase activeRuleBase;
+ private String allowedRuleReference;
+ private String deniedRuleReference;
public void setUp() throws Exception
{
+ this.allowedRuleReference = "roles://allowRule/"+GeneralTool.generateUniqueId();
+ this.deniedRuleReference = "roles://denyRule/"+GeneralTool.generateUniqueId();
+
StringBuilder buffer = new StringBuilder();
buffer.append(rulePkg+"\n");
@@ -82,7 +87,7 @@
finally
{
source.close();
- }
+ }
}
public void tearDown() throws Exception
@@ -96,7 +101,7 @@
WorkingMemory workingMemory = this.activeRuleBase.newStatefulSession();
//SetUp the context data
- workingMemory.insert("roles://allowRule/"+GeneralTool.generateUniqueId());
+ workingMemory.insert(this.allowedRuleReference);
Set roles = new HashSet();
roles.add("admin");
roles.add("superuser");
@@ -127,7 +132,7 @@
WorkingMemory workingMemory = this.activeRuleBase.newStatefulSession();
//SetUp the context data
- workingMemory.insert("roles://denyRule/"+GeneralTool.generateUniqueId());
+ workingMemory.insert(this.deniedRuleReference);
Set roles = new HashSet();
roles.add("anonymous");
workingMemory.insert(roles);
@@ -162,7 +167,7 @@
}
String condition = buffer.toString().trim();
String rule = MessageFormat.format(Roles.allowRule,
- new Object[]{GeneralTool.generateUniqueId(), condition.substring(0, condition.length()-2).trim()});
+ new Object[]{this.allowedRuleReference, condition.substring(0, condition.length()-2).trim()});
return rule;
}
@@ -178,7 +183,7 @@
}
String condition = buffer.toString().trim();
String rule = MessageFormat.format(Roles.denyRule,
- new Object[]{GeneralTool.generateUniqueId(), condition.substring(0, condition.length()-2).trim()});
+ new Object[]{this.deniedRuleReference, condition.substring(0, condition.length()-2).trim()});
return rule;
}
Modified: modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/components/TestURLPattern.java
===================================================================
--- modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/components/TestURLPattern.java 2009-07-29 17:06:25 UTC (rev 13628)
+++ modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/components/TestURLPattern.java 2009-07-29 20:01:36 UTC (rev 13629)
@@ -89,27 +89,19 @@
assertFalse("Match(prefix/urlfoo/)",Pattern.matches(regex, "prefix/urlfoo/"));
assertFalse("Match(/blah/prefix/url/index.html)",Pattern.matches(regex, "/blah/prefix/url/index.html"));
- HttpResource httpResource = new HttpResource();
- httpResource.setUri(new URI("/prefix/url/*"));
-
- Roles allowedRoles = new Roles();
- allowedRoles.addName("Admin");
-
- //Setup the Context for the Composition with these components
- CompositionContext context = new CompositionContext();
- context.setPolicyTarget(httpResource);
- context.addPolicyRule(Effect.PERMIT, new Get(), allowedRoles, "allowExpression");
+ //TODO: fix issue with duplicate matches when using concrete uris and regex uris
+ this.provision("/prefix/url/*");
+ //this.provision("/prefix/url/index.html");
- //Store the policy into the Policy Server
- PolicyMetaData policyMetaData = this.policyComposer.compose(context);
- this.provisioner.newPolicy(policyMetaData);
-
//Assert Policy State of the Server
Policy[] policies = this.provisioner.readAllPolicies();
- assertTrue("Policy Store must not be empty!!", (policies != null && policies.length == 1));
+ assertTrue("Policy Store must not be empty!!", (policies != null));
log.info("------------------------------------------------------------------------------");
- log.info(policies[0].generateSystemPolicy());
+ for(Policy local: policies)
+ {
+ log.info(local.generateSystemPolicy());
+ }
//Access Granted
this.enforce(this.createEnforcementContext("/prefix/url"), true);
@@ -166,4 +158,22 @@
return context;
}
+
+ private void provision(String urlPattern) throws Exception
+ {
+ HttpResource httpResource = new HttpResource();
+ httpResource.setUri(new URI(urlPattern));
+
+ Roles allowedRoles = new Roles();
+ allowedRoles.addName("Admin");
+
+ //Setup the Context for the Composition with these components
+ CompositionContext context = new CompositionContext();
+ context.setPolicyTarget(httpResource);
+ context.addPolicyRule(Effect.PERMIT, new Get(), allowedRoles, "allowExpression");
+
+ //Store the policy into the Policy Server
+ PolicyMetaData policyMetaData = this.policyComposer.compose(context);
+ this.provisioner.newPolicy(policyMetaData);
+ }
}
Modified: modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/plugin/DroolsFunction.java
===================================================================
--- modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/plugin/DroolsFunction.java 2009-07-29 17:06:25 UTC (rev 13628)
+++ modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/plugin/DroolsFunction.java 2009-07-29 20:01:36 UTC (rev 13629)
@@ -116,8 +116,9 @@
for(int i=0,size=inputs.size(); i<size; i++)
{
VariableReference reference = (VariableReference)inputs.get(i);
+ String referenceId = reference.getVariableId();
- log.debug("Firing Rule ="+reference.getVariableId());
+ log.debug("Firing Rule ="+referenceId);
//Establish a Stateful Drools Session
DroolsRuleManager ruleManager = (DroolsRuleManager)ServiceContainer.lookup("/policy-server/DroolsRuleManager");
@@ -125,7 +126,7 @@
WorkingMemory workingMemory = ruleBase.newStatefulSession();
//Populate the WorkingMemory with Facts
- workingMemory.insert(reference.getVariableId());
+ workingMemory.insert(referenceId);
this.prepareWorkingMemory(workingMemory, context);
14 years, 9 months
JBoss Portal SVN: r13628 - in modules/cms/tags/JBP_CMS_1_2_6: build and 1 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-07-29 13:06:25 -0400 (Wed, 29 Jul 2009)
New Revision: 13628
Modified:
modules/cms/tags/JBP_CMS_1_2_6/build/pom.xml
modules/cms/tags/JBP_CMS_1_2_6/cms-jackrabbit/pom.xml
modules/cms/tags/JBP_CMS_1_2_6/pom.xml
Log:
Tagging 1.2.6
Modified: modules/cms/tags/JBP_CMS_1_2_6/build/pom.xml
===================================================================
--- modules/cms/tags/JBP_CMS_1_2_6/build/pom.xml 2009-07-29 17:02:52 UTC (rev 13627)
+++ modules/cms/tags/JBP_CMS_1_2_6/build/pom.xml 2009-07-29 17:06:25 UTC (rev 13628)
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.cms</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.2.6</version>
<packaging>pom</packaging>
<name>JBoss Portal CMS</name>
<url>http://www.jboss.com/products/jbossmc</url>
Modified: modules/cms/tags/JBP_CMS_1_2_6/cms-jackrabbit/pom.xml
===================================================================
--- modules/cms/tags/JBP_CMS_1_2_6/cms-jackrabbit/pom.xml 2009-07-29 17:02:52 UTC (rev 13627)
+++ modules/cms/tags/JBP_CMS_1_2_6/cms-jackrabbit/pom.xml 2009-07-29 17:06:25 UTC (rev 13628)
@@ -5,7 +5,7 @@
<groupId>org.jboss.portal.cms</groupId>
<artifactId>module-parent</artifactId>
<relativePath>../build/pom.xml</relativePath>
- <version>trunk-SNAPSHOT</version>
+ <version>1.2.6</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<artifactId>cms-jackrabbit</artifactId>
Modified: modules/cms/tags/JBP_CMS_1_2_6/pom.xml
===================================================================
--- modules/cms/tags/JBP_CMS_1_2_6/pom.xml 2009-07-29 17:02:52 UTC (rev 13627)
+++ modules/cms/tags/JBP_CMS_1_2_6/pom.xml 2009-07-29 17:06:25 UTC (rev 13628)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal CMS Module</name>
- <version>trunk-SNAPSHOT</version>
+ <version>1.2.6</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
14 years, 9 months
JBoss Portal SVN: r13627 - modules/cms/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-07-29 13:02:52 -0400 (Wed, 29 Jul 2009)
New Revision: 13627
Added:
modules/cms/tags/JBP_CMS_1_2_6/
Log:
tagging CMS 1.2.6
Copied: modules/cms/tags/JBP_CMS_1_2_6 (from rev 13626, modules/cms/trunk)
14 years, 9 months
JBoss Portal SVN: r13626 - modules/cms/trunk/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-07-29 13:01:52 -0400 (Wed, 29 Jul 2009)
New Revision: 13626
Modified:
modules/cms/trunk/build/pom.xml
Log:
updating dependencies
Modified: modules/cms/trunk/build/pom.xml
===================================================================
--- modules/cms/trunk/build/pom.xml 2009-07-29 15:37:36 UTC (rev 13625)
+++ modules/cms/trunk/build/pom.xml 2009-07-29 17:01:52 UTC (rev 13626)
@@ -44,9 +44,9 @@
<version.ehcache>1.4.1</version.ehcache>
<version.javax.jcr>1.0</version.javax.jcr>
<version.jackrabbit.core>1.4.5</version.jackrabbit.core>
- <version.jboss.portal.common>1.2.3</version.jboss.portal.common>
- <version.jboss.portal.identity>1.0.6</version.jboss.portal.identity>
- <version.jboss.portal.test>1.2.2</version.jboss.portal.test>
+ <version.jboss.portal.common>1.2.5</version.jboss.portal.common>
+ <version.jboss.portal.identity>1.1.0</version.jboss.portal.identity>
+ <version.jboss.portal.test>1.2.3</version.jboss.portal.test>
<version.jboss.portal>2.7.1.GA</version.jboss.portal>
</properties>
14 years, 9 months
JBoss Portal SVN: r13625 - in modules/portlet/tags/JBP_PORTLET_2_0_8: bridge and 13 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-07-29 11:37:36 -0400 (Wed, 29 Jul 2009)
New Revision: 13625
Modified:
modules/portlet/tags/JBP_PORTLET_2_0_8/bridge/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_8/build/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_8/controller/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_8/docs/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_8/docs/user-guide/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_8/federation/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_8/jsr168api/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_8/management/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_8/mc/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_8/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_8/portal/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_8/portlet/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_8/portlet/src/main/java/org/jboss/portal/portlet/spi/PortalContext.java
modules/portlet/tags/JBP_PORTLET_2_0_8/releaseLibs.sh
modules/portlet/tags/JBP_PORTLET_2_0_8/samples/pom.xml
modules/portlet/tags/JBP_PORTLET_2_0_8/test/pom.xml
Log:
Applying correct verion number
Modified: modules/portlet/tags/JBP_PORTLET_2_0_8/bridge/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_8/bridge/pom.xml 2009-07-29 15:23:46 UTC (rev 13624)
+++ modules/portlet/tags/JBP_PORTLET_2_0_8/bridge/pom.xml 2009-07-29 15:37:36 UTC (rev 13625)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.8</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -24,4 +24,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_8/build/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_8/build/pom.xml 2009-07-29 15:23:46 UTC (rev 13624)
+++ modules/portlet/tags/JBP_PORTLET_2_0_8/build/pom.xml 2009-07-29 15:37:36 UTC (rev 13625)
@@ -18,7 +18,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.8</version>
<packaging>pom</packaging>
<name>JBoss Portal Portlet Module</name>
<description>JBoss Portal Portlet Module</description>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_8/controller/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_8/controller/pom.xml 2009-07-29 15:23:46 UTC (rev 13624)
+++ modules/portlet/tags/JBP_PORTLET_2_0_8/controller/pom.xml 2009-07-29 15:37:36 UTC (rev 13625)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.8</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_8/docs/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_8/docs/pom.xml 2009-07-29 15:23:46 UTC (rev 13624)
+++ modules/portlet/tags/JBP_PORTLET_2_0_8/docs/pom.xml 2009-07-29 15:37:36 UTC (rev 13625)
@@ -4,13 +4,13 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.8</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<artifactId>docs-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Portlet Docs Aggregator</name>
- <version>2.0-Beta1</version>
+ <version>2.0.8</version>
<url>http://labs.jboss.com/jbossportal</url>
<modules>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_8/docs/user-guide/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_8/docs/user-guide/pom.xml 2009-07-29 15:23:46 UTC (rev 13624)
+++ modules/portlet/tags/JBP_PORTLET_2_0_8/docs/user-guide/pom.xml 2009-07-29 15:37:36 UTC (rev 13625)
@@ -11,7 +11,7 @@
</parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>user-guide-${translation}</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.8</version>
<packaging>jdocbook</packaging>
<name>User_Guide_(${translation})</name>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_8/federation/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_8/federation/pom.xml 2009-07-29 15:23:46 UTC (rev 13624)
+++ modules/portlet/tags/JBP_PORTLET_2_0_8/federation/pom.xml 2009-07-29 15:37:36 UTC (rev 13625)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.8</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -62,4 +62,4 @@
</build>
-</project>
\ No newline at end of file
+</project>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_8/jsr168api/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_8/jsr168api/pom.xml 2009-07-29 15:23:46 UTC (rev 13624)
+++ modules/portlet/tags/JBP_PORTLET_2_0_8/jsr168api/pom.xml 2009-07-29 15:37:36 UTC (rev 13625)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.8</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_8/management/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_8/management/pom.xml 2009-07-29 15:23:46 UTC (rev 13624)
+++ modules/portlet/tags/JBP_PORTLET_2_0_8/management/pom.xml 2009-07-29 15:37:36 UTC (rev 13625)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.8</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -20,4 +20,4 @@
</dependencies>
-</project>
\ No newline at end of file
+</project>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_8/mc/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_8/mc/pom.xml 2009-07-29 15:23:46 UTC (rev 13624)
+++ modules/portlet/tags/JBP_PORTLET_2_0_8/mc/pom.xml 2009-07-29 15:37:36 UTC (rev 13625)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.8</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_8/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_8/pom.xml 2009-07-29 15:23:46 UTC (rev 13624)
+++ modules/portlet/tags/JBP_PORTLET_2_0_8/pom.xml 2009-07-29 15:37:36 UTC (rev 13625)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Portlet Module Aggregator</name>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.8</version>
<url>http://labs.jboss.com/jbossportal</url>
<dependencies/>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_8/portal/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_8/portal/pom.xml 2009-07-29 15:23:46 UTC (rev 13624)
+++ modules/portlet/tags/JBP_PORTLET_2_0_8/portal/pom.xml 2009-07-29 15:37:36 UTC (rev 13625)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.8</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_8/portlet/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_8/portlet/pom.xml 2009-07-29 15:23:46 UTC (rev 13624)
+++ modules/portlet/tags/JBP_PORTLET_2_0_8/portlet/pom.xml 2009-07-29 15:37:36 UTC (rev 13625)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.8</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -206,4 +206,4 @@
</plugins>
</build>
-</project>
\ No newline at end of file
+</project>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_8/portlet/src/main/java/org/jboss/portal/portlet/spi/PortalContext.java
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_8/portlet/src/main/java/org/jboss/portal/portlet/spi/PortalContext.java 2009-07-29 15:23:46 UTC (rev 13624)
+++ modules/portlet/tags/JBP_PORTLET_2_0_8/portlet/src/main/java/org/jboss/portal/portlet/spi/PortalContext.java 2009-07-29 15:37:36 UTC (rev 13625)
@@ -37,7 +37,7 @@
*/
public interface PortalContext
{
- public static final Version VERSION = new Version("JBoss Portlet Container", 2, 0, 8, new Version.Qualifier(Version.Qualifier.Prefix.SNAPSHOT), "Community");
+ public static final Version VERSION = new Version("JBoss Portlet Container", 2, 0, 8, new Version.Qualifier(Version.Qualifier.Prefix.GA), "Community");
/**
* Return info about the portal.
Modified: modules/portlet/tags/JBP_PORTLET_2_0_8/releaseLibs.sh
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_8/releaseLibs.sh 2009-07-29 15:23:46 UTC (rev 13624)
+++ modules/portlet/tags/JBP_PORTLET_2_0_8/releaseLibs.sh 2009-07-29 15:37:36 UTC (rev 13625)
@@ -1,4 +1,4 @@
-repos=$HOME/Dev/portal-modules-repos/portlet/trunk-SNAPSHOT/lib
+repos=$HOME/Dev/portal-modules-repos/portlet/2.0.8/lib
thirdparty=$HOME/Dev/jboss-portal-2.7/thirdparty/jboss-portal/modules/portlet/lib
echo "Copies current version of portlet libraries either to local repository copy or Portal thirdparty to test or release purpose"
@@ -25,9 +25,9 @@
echo "Releasing to Portal thirdparty"
fi
-cp bridge/target/portlet-bridge-trunk-SNAPSHOT.jar $loc/portal-portlet-bridge-lib.jar
-cp controller/target/portlet-controller-trunk-SNAPSHOT.jar $loc/portal-portlet-controller-lib.jar
-cp federation/target/portlet-federation-trunk-SNAPSHOT.jar $loc/portal-portlet-federation-lib.jar
-cp management/target/portlet-management-trunk-SNAPSHOT.jar $loc/portal-portlet-management-lib.jar
-cp portlet/target/portlet-portlet-trunk-SNAPSHOT.jar $loc/portal-portlet-lib.jar
-cp samples/target/portlet-samples-trunk-SNAPSHOT.jar $loc/portal-portlet-samples-lib.jar
+cp bridge/target/portlet-bridge-2.0.8.jar $loc/portal-portlet-bridge-lib.jar
+cp controller/target/portlet-controller-2.0.8.jar $loc/portal-portlet-controller-lib.jar
+cp federation/target/portlet-federation-2.0.8.jar $loc/portal-portlet-federation-lib.jar
+cp management/target/portlet-management-2.0.8.jar $loc/portal-portlet-management-lib.jar
+cp portlet/target/portlet-portlet-2.0.8.jar $loc/portal-portlet-lib.jar
+cp samples/target/portlet-samples-2.0.8.jar $loc/portal-portlet-samples-lib.jar
Modified: modules/portlet/tags/JBP_PORTLET_2_0_8/samples/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_8/samples/pom.xml 2009-07-29 15:23:46 UTC (rev 13624)
+++ modules/portlet/tags/JBP_PORTLET_2_0_8/samples/pom.xml 2009-07-29 15:37:36 UTC (rev 13625)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.8</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_PORTLET_2_0_8/test/pom.xml
===================================================================
--- modules/portlet/tags/JBP_PORTLET_2_0_8/test/pom.xml 2009-07-29 15:23:46 UTC (rev 13624)
+++ modules/portlet/tags/JBP_PORTLET_2_0_8/test/pom.xml 2009-07-29 15:37:36 UTC (rev 13625)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.portlet</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>2.0.8</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
14 years, 9 months
JBoss Portal SVN: r13624 - modules/portlet/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-07-29 11:23:46 -0400 (Wed, 29 Jul 2009)
New Revision: 13624
Added:
modules/portlet/tags/JBP_PORTLET_2_0_8/
Log:
Tagging Portlet
Copied: modules/portlet/tags/JBP_PORTLET_2_0_8 (from rev 13623, modules/portlet/trunk)
14 years, 9 months
JBoss Portal SVN: r13623 - modules/portlet/trunk/build.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-07-29 11:16:27 -0400 (Wed, 29 Jul 2009)
New Revision: 13623
Modified:
modules/portlet/trunk/build/pom.xml
Log:
updating internal libs
Modified: modules/portlet/trunk/build/pom.xml
===================================================================
--- modules/portlet/trunk/build/pom.xml 2009-07-29 14:49:51 UTC (rev 13622)
+++ modules/portlet/trunk/build/pom.xml 2009-07-29 15:16:27 UTC (rev 13623)
@@ -33,8 +33,8 @@
<version.jboss-logging>2.0.4.GA</version.jboss-logging>
<version.jbossxb>2.0.0.GA</version.jbossxb>
<version.jboss-remoting>2.2.1.GA</version.jboss-remoting>
- <version.jboss.portal.common>1.2.3</version.jboss.portal.common>
- <version.jboss.portal.web>1.2.0-SNAPSHOT</version.jboss.portal.web>
+ <version.jboss.portal.common>1.2.5</version.jboss.portal.common>
+ <version.jboss.portal.web>1.2.3</version.jboss.portal.web>
<version.jboss.unit>1.2.3</version.jboss.unit>
<version.log4j>1.2.14</version.log4j>
<version.apache.commons-logging>1.1.1</version.apache.commons-logging>
14 years, 9 months
JBoss Portal SVN: r13622 - docs/enterprise/tags.
by portal-commits＠lists.jboss.org
Author: prabhat.jha(a)jboss.com
Date: 2009-07-29 10:49:51 -0400 (Wed, 29 Jul 2009)
New Revision: 13622
Added:
docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02/
Log:
creating tag for EPP 4.3 CP02 docs
Copied: docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP02 (from rev 13621, docs/enterprise/tags/Enterprise_Portal_Platform_4_3_GA_CP01)
14 years, 9 months
JBoss Portal SVN: r13621 - in modules/portlet/tags/JBP_COMMON_1_2_5: build and 3 other directories.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-07-29 10:08:03 -0400 (Wed, 29 Jul 2009)
New Revision: 13621
Modified:
modules/portlet/tags/JBP_COMMON_1_2_5/build/pom.xml
modules/portlet/tags/JBP_COMMON_1_2_5/common/pom.xml
modules/portlet/tags/JBP_COMMON_1_2_5/mc/pom.xml
modules/portlet/tags/JBP_COMMON_1_2_5/pom.xml
modules/portlet/tags/JBP_COMMON_1_2_5/portal/pom.xml
modules/portlet/tags/JBP_COMMON_1_2_5/releaseLibs.sh
Log:
Common 1.2.5
Modified: modules/portlet/tags/JBP_COMMON_1_2_5/build/pom.xml
===================================================================
--- modules/portlet/tags/JBP_COMMON_1_2_5/build/pom.xml 2009-07-29 13:59:40 UTC (rev 13620)
+++ modules/portlet/tags/JBP_COMMON_1_2_5/build/pom.xml 2009-07-29 14:08:03 UTC (rev 13621)
@@ -10,7 +10,7 @@
<artifactId>module-parent</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Modules Common</name>
- <version>trunk-SNAPSHOT</version>
+ <version>1.2.5</version>
<url>http://labs.jboss.com/jbossportal</url>
<properties>
Modified: modules/portlet/tags/JBP_COMMON_1_2_5/common/pom.xml
===================================================================
--- modules/portlet/tags/JBP_COMMON_1_2_5/common/pom.xml 2009-07-29 13:59:40 UTC (rev 13620)
+++ modules/portlet/tags/JBP_COMMON_1_2_5/common/pom.xml 2009-07-29 14:08:03 UTC (rev 13621)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.common</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.2.5</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_COMMON_1_2_5/mc/pom.xml
===================================================================
--- modules/portlet/tags/JBP_COMMON_1_2_5/mc/pom.xml 2009-07-29 13:59:40 UTC (rev 13620)
+++ modules/portlet/tags/JBP_COMMON_1_2_5/mc/pom.xml 2009-07-29 14:08:03 UTC (rev 13621)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.common</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.2.5</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_COMMON_1_2_5/pom.xml
===================================================================
--- modules/portlet/tags/JBP_COMMON_1_2_5/pom.xml 2009-07-29 13:59:40 UTC (rev 13620)
+++ modules/portlet/tags/JBP_COMMON_1_2_5/pom.xml 2009-07-29 14:08:03 UTC (rev 13621)
@@ -5,7 +5,7 @@
<artifactId>module-aggregator</artifactId>
<packaging>pom</packaging>
<name>JBoss Portal Modules Common (aggregator)</name>
- <version>trunk-SNAPSHOT</version>
+ <version>1.2.5</version>
<distributionManagement>
<repository>
Modified: modules/portlet/tags/JBP_COMMON_1_2_5/portal/pom.xml
===================================================================
--- modules/portlet/tags/JBP_COMMON_1_2_5/portal/pom.xml 2009-07-29 13:59:40 UTC (rev 13620)
+++ modules/portlet/tags/JBP_COMMON_1_2_5/portal/pom.xml 2009-07-29 14:08:03 UTC (rev 13621)
@@ -3,7 +3,7 @@
<parent>
<groupId>org.jboss.portal.common</groupId>
<artifactId>module-parent</artifactId>
- <version>trunk-SNAPSHOT</version>
+ <version>1.2.5</version>
<relativePath>../build/pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
Modified: modules/portlet/tags/JBP_COMMON_1_2_5/releaseLibs.sh
===================================================================
--- modules/portlet/tags/JBP_COMMON_1_2_5/releaseLibs.sh 2009-07-29 13:59:40 UTC (rev 13620)
+++ modules/portlet/tags/JBP_COMMON_1_2_5/releaseLibs.sh 2009-07-29 14:08:03 UTC (rev 13621)
@@ -1,4 +1,4 @@
-repos=$HOME/Dev/portal-modules-repos/common/trunk-SNAPSHOT/lib
+repos=$HOME/Dev/portal-modules-repos/common/1.2.5/lib
thirdparty=$HOME/Dev/jboss-portal-2.7/thirdparty/jboss-portal/modules/common/lib/
echo "Copies current version of common libraries either to local repository copy or Portal thirdparty to test or release purpose"
@@ -26,6 +26,6 @@
fi
-cp common/target/common-common-trunk-SNAPSHOT.jar $loc/portal-common-lib.jar
-cp mc/target/common-mc-trunk-SNAPSHOT.jar $loc/portal-common-mc-lib.jar
-cp portal/target/common-portal-trunk-SNAPSHOT.jar $loc/portal-common-portal-lib.jar
+cp common/target/common-common-1.2.5.jar $loc/portal-common-lib.jar
+cp mc/target/common-mc-1.2.5.jar $loc/portal-common-mc-lib.jar
+cp portal/target/common-portal-1.2.5.jar $loc/portal-common-portal-lib.jar
14 years, 9 months
JBoss Portal SVN: r13620 - modules/portlet/tags.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-07-29 09:59:40 -0400 (Wed, 29 Jul 2009)
New Revision: 13620
Added:
modules/portlet/tags/JBP_COMMON_1_2_5/
Log:
Tagging common module
Copied: modules/portlet/tags/JBP_COMMON_1_2_5 (from rev 13619, modules/common/trunk)
14 years, 9 months