JBoss Portal SVN: r13010 - in branches/JBoss_Portal_AS5_Deployer/widget/src/resources: portal-widget-war/WEB-INF and 1 other directory.
by portal-commits@lists.jboss.org
Author: mwringe
Date: 2009-03-10 01:37:13 -0400 (Tue, 10 Mar 2009)
New Revision: 13010
Modified:
branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-netvibes-war/WEB-INF/portlet.xml
branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-war/WEB-INF/portlet.xml
Log:
Make portlet.xml files properly validate against the xsd.
Modified: branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-netvibes-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-netvibes-war/WEB-INF/portlet.xml 2009-03-10 05:36:16 UTC (rev 13009)
+++ branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-netvibes-war/WEB-INF/portlet.xml 2009-03-10 05:37:13 UTC (rev 13010)
@@ -66,7 +66,9 @@
<title>Netvibes Widget</title>
<keywords>widget,netvibes</keywords>
</portlet-info>
- <supported-publishing-event xmlns:x="urn:jboss:portal:content">x:select</supported-publishing-event>
+ <supported-publishing-event>
+ <qname xmlns:x="urn:jboss:portal:content">x:select</qname>
+ </supported-publishing-event>
<supported-public-render-parameter>uri</supported-public-render-parameter>
<supported-public-render-parameter>parameters</supported-public-render-parameter>
</portlet>
Modified: branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-war/WEB-INF/portlet.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-war/WEB-INF/portlet.xml 2009-03-10 05:36:16 UTC (rev 13009)
+++ branches/JBoss_Portal_AS5_Deployer/widget/src/resources/portal-widget-war/WEB-INF/portlet.xml 2009-03-10 05:37:13 UTC (rev 13010)
@@ -61,7 +61,9 @@
<title>Google Widget</title>
<keywords>widget,google</keywords>
</portlet-info>
- <supported-publishing-event xmlns:x="urn:jboss:portal:content">x:select</supported-publishing-event>
+ <supported-publishing-event>
+ <qname xmlns:x="urn:jboss:portal:content">x:select</qname>
+ </supported-publishing-event>
<supported-public-render-parameter>uri</supported-public-render-parameter>
</portlet>
17 years, 1 month
JBoss Portal SVN: r13009 - branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/jboss.
by portal-commits@lists.jboss.org
Author: mwringe
Date: 2009-03-10 01:36:16 -0400 (Tue, 10 Mar 2009)
New Revision: 13009
Modified:
branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java
Log:
Need to catch potential NullPointerExceptions that can occur now that the ServerDeployer isn't being used for wars that contain portlets.
Modified: branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java 2009-03-10 05:34:19 UTC (rev 13008)
+++ branches/JBoss_Portal_AS5_Deployer/server/src/main/org/jboss/portal/server/deployment/jboss/ServerDeployer.java 2009-03-10 05:36:16 UTC (rev 13009)
@@ -232,8 +232,10 @@
public void stop(DeploymentInfo di) throws DeploymentException
{
PortalDeploymentInfoContext pdiCtx = (PortalDeploymentInfoContext)infoContexts.get(di.url);
+ if (pdiCtx != null)
+ {
pdiCtx.stop();
-
+ }
//
super.stop(di);
}
@@ -241,8 +243,10 @@
public void destroy(DeploymentInfo di) throws DeploymentException
{
PortalDeploymentInfoContext pdiCtx = (PortalDeploymentInfoContext)infoContexts.get(di.url);
+ if (pdiCtx != null)
+ {
pdiCtx.destroy();
-
+ }
//
super.destroy(di);
}
17 years, 1 month
JBoss Portal SVN: r13008 - branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/jsp.
by portal-commits@lists.jboss.org
Author: mwringe
Date: 2009-03-10 01:34:19 -0400 (Tue, 10 Mar 2009)
New Revision: 13008
Modified:
branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/jsp/JSPPortlet.java
Log:
Use portlet context to get reference to resource instead of the context classloader.
Modified: branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/jsp/JSPPortlet.java
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/jsp/JSPPortlet.java 2009-03-10 05:32:36 UTC (rev 13007)
+++ branches/JBoss_Portal_AS5_Deployer/core-samples/src/main/org/jboss/portal/core/samples/jsp/JSPPortlet.java 2009-03-10 05:34:19 UTC (rev 13008)
@@ -66,7 +66,7 @@
public void serveResource(ResourceRequest resourceRequest, ResourceResponse resourceResponse) throws PortletException, IOException
{
String resourceID = resourceRequest.getResourceID();
- InputStream asStream = Thread.currentThread().getContextClassLoader().getResourceAsStream("images/" + resourceID + ".gif");
+ InputStream asStream = this.getPortletContext().getResourceAsStream("/images/" + resourceID + ".gif");
resourceResponse.setContentType("image/gif");
byte[] buffer = new byte[1024];
ByteArrayOutputStream out = new ByteArrayOutputStream();
17 years, 1 month
JBoss Portal SVN: r13007 - branches/JBoss_Portal_AS5_Deployer/core-management/src/resources/portal-management-sar/META-INF.
by portal-commits@lists.jboss.org
Author: mwringe
Date: 2009-03-10 01:32:36 -0400 (Tue, 10 Mar 2009)
New Revision: 13007
Added:
branches/JBoss_Portal_AS5_Deployer/core-management/src/resources/portal-management-sar/META-INF/jboss-dependency.xml
Log:
Add jboss-dependency.xml to handle service dependencies.
Added: branches/JBoss_Portal_AS5_Deployer/core-management/src/resources/portal-management-sar/META-INF/jboss-dependency.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core-management/src/resources/portal-management-sar/META-INF/jboss-dependency.xml (rev 0)
+++ branches/JBoss_Portal_AS5_Deployer/core-management/src/resources/portal-management-sar/META-INF/jboss-dependency.xml 2009-03-10 05:32:36 UTC (rev 13007)
@@ -0,0 +1,5 @@
+<!-- this should be removed when the jboss-service.xml is updated to a -beans.xml file -->
+<!-- this file only exists right now because the jboss-service.xml dependency management is lacking -->
+<dependency xmlns="urn:jboss:dependency:1.0">
+ <item whenRequired="Real" dependentState="Create">portal:service=PortletInvoker,type=Federating</item>
+</dependency>
17 years, 1 month
JBoss Portal SVN: r13006 - in branches/JBoss_Portal_AS5_Deployer/core/src: main/org/jboss/portal/core/servlet/jsp and 3 other directories.
by portal-commits@lists.jboss.org
Author: mwringe
Date: 2009-03-10 01:31:06 -0400 (Tue, 10 Mar 2009)
New Revision: 13006
Modified:
branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentImpl.java
branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletDeploymentImpl.java
branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java
branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/test/core/OutELTestCase.java
branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml
branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/portal-aop.xml
Log:
Update PortalJSP to properly initialize the jsp.
Temporality remove second level cache from hibernate.
Enable transactions in the portal-aop.xml since they are no longer enable by default in AS5.
Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentImpl.java
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentImpl.java 2009-03-09 22:47:19 UTC (rev 13005)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/ObjectDeploymentImpl.java 2009-03-10 05:31:06 UTC (rev 13006)
@@ -121,11 +121,9 @@
public void deployObjects(PortalObjectMetaData portalObjectMetaData, ClassLoader webappClassLoader)
throws DeploymentException
{
- System.out.println("OBJECTDEPLOYMENTIMPL DEPLOY : " + portalObjectMetaData);
try{
for (PortalObjectDeploymentMetaData objectDeploymentMetaData : portalObjectMetaData.getDeployments())
{
- System.out.println("GETCONTEXT : " + objectDeploymentMetaData.getContext());
if (objectDeploymentMetaData.getContext() != null)
{
createPortalObject(objectDeploymentMetaData, webappClassLoader);
@@ -167,8 +165,6 @@
public void createPortalObject(PortalObjectDeploymentMetaData portalObjectMetaData, ClassLoader webappClassLoader)
throws Exception
{
- System.out.println ("CREATEPORTALOBJECT");
-
ContextMetaData contextMetaData = portalObjectMetaData.getContext();
PortalMetaData portalMetaData = portalObjectMetaData.getPortal();
PageMetaData pageMetaData = portalObjectMetaData.getPage();
@@ -194,7 +190,6 @@
}
String parentRef = portalObjectMetaData.getParentRef();
- System.out.println("PARENTREF : \'" + parentRef + "\' : " + (parentRef == null) + " : " + portalObjectMetaData + " : " + contextMetaData + " : " + portalMetaData + " : " + pageMetaData + " : " + windowMetaData );
PortalObjectId parentId = (parentRef == null) ? null : PortalObjectId.parse(parentRef,
PortalObjectPath.LEGACY_FORMAT);
if (parentId != null)
@@ -243,8 +238,6 @@
IllegalCoordinationException
{
PortalObject portalObject;
-
- System.out.println("COMMONPORTALOBJECT " + commonPortalObject);
if (commonPortalObject instanceof ContextMetaData)
{
@@ -268,8 +261,6 @@
}
configure(commonPortalObject, portalObject, webappClassLoader);
-
- System.out.println("COMMON PORTAL OBJECT : " + commonPortalObject);
if (commonPortalObject.getChildren() != null)
{
@@ -322,7 +313,6 @@
public PortalObject createPortalObject(PortalMetaData portalMetaData, PortalObject parent)
throws IllegalArgumentException, DuplicatePortalObjectException
{
- System.out.println("PARENT IS " + parent);
if (!(parent instanceof PortalContainer))
{
throw new IllegalArgumentException("Not a context");
@@ -390,8 +380,6 @@
{
// Configure properties
- System.out.println("COMMONPORTALOBJECT : " + commonPortalObject.getName());
-
if (commonPortalObject.getProperties() != null && commonPortalObject.getProperties().getProperties() != null)
{
List<PropertyMetaData> propertyMetaData = commonPortalObject.getProperties().getProperties();
@@ -454,7 +442,6 @@
if (commonPortalObject.getSecurityConstraint() != null)
{
- System.out.println("GOT SECURITY CONSTRAINTS : " + commonPortalObject.getSecurityConstraint().getPolicyPermission().size());
for (int i = 0; i < commonPortalObject.getSecurityConstraint().getPolicyPermission().size(); i++)
{
PolicyPermissionMetaData policyPermissionMetaData = commonPortalObject.getSecurityConstraint()
@@ -505,15 +492,6 @@
+ "configuration but it is not taken in account, portlet instance configuration should be done rather");
}
}
-
- System.out.println("SECURITY BINDINGS : " + securityBindings);
- if (securityBindings != null)
- {
- for (RoleSecurityBinding rsb : securityBindings)
- {
- System.out.println("RSB : " + rsb.getRoleName() + " : " + rsb.getActionsAsString());
- }
- }
//
if (securityBindings != null)
Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletDeploymentImpl.java
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletDeploymentImpl.java 2009-03-09 22:47:19 UTC (rev 13005)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/deployment/jboss/PortletDeploymentImpl.java 2009-03-10 05:31:06 UTC (rev 13006)
@@ -91,22 +91,17 @@
JBossPortletAppMetaData jbossPortletAppMetaData, PortletApplication10MetaData portletAppMetaData)
throws DeploymentException
{
- System.out.println("DEPLOY PORTLETS");
PortalWebApplication portalWebApp = new PortalWebApplication(servletContext, url, classloader, contextPath);
deployPortlets(portalWebApp, jbossPortletAppMetaData, portletAppMetaData);
}
public void deployPortlets(PortalWebApp pwa, JBossPortletAppMetaData jbossAppMD, PortletApplication10MetaData portletAppMD)
{
- System.out.println("DEPLOY PORTLETS PWA");
InfoBuilder infoBuilder = coreInfoBuilderFactory.createInfoBuilder(pwa, jbossAppMD, portletAppMD);
infoBuilder.build();
- System.out.println("GETAPPLICATION : " + infoBuilder.getApplication().getId());
PortletApplicationObject portletApplicationObject = new PortletApplicationImpl(infoBuilder.getApplication());
PortletApplicationContext portletApplicationContext = new PortletApplicationContextImpl(pwa);
-
- System.out.println("INFOBUILDER : " + infoBuilder.getPortlets() + " : " + infoBuilder.getPortlets().size());
//
PortletApplicationLifeCycle portletApplicationLifeCycle = new PortletApplicationLifeCycle(bridgeToInvoker, portletApplicationContext,
@@ -122,13 +117,11 @@
//
portletApplicationLifeCycle.addPortletFilter(portletFilterContext, portletFilterObject);
- System.out.println("ADDING FILTERINFO : " + portletFilterContext + " : " + portletFilterObject);
}
//
for (PortletInfo portletInfo : infoBuilder.getPortlets())
{
- System.out.println("PORTLETINFO : " + portletInfo);
ContainerPortletInfo cpi = (ContainerPortletInfo) portletInfo;
PortletContainerObject portletContainerObject = new PortletContainerImpl(cpi);
PortletContainerContext portletContainerContext = new PortletContainerContextImpl();
Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java 2009-03-09 22:47:19 UTC (rev 13005)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/core/servlet/jsp/PortalJsp.java 2009-03-10 05:31:06 UTC (rev 13006)
@@ -71,6 +71,8 @@
abstract public void _jspService(HttpServletRequest arg0, HttpServletResponse arg1) throws ServletException,
IOException;
+ abstract public void _jspInit();
+
/**
* HttpJspPage implementation
*
@@ -98,6 +100,7 @@
{
this.config = config;
jspInit();
+ _jspInit();
}
/**
Modified: branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/test/core/OutELTestCase.java
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/test/core/OutELTestCase.java 2009-03-09 22:47:19 UTC (rev 13005)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/main/org/jboss/portal/test/core/OutELTestCase.java 2009-03-10 05:31:06 UTC (rev 13006)
@@ -55,6 +55,12 @@
{
assertEquals("value", PortalLib.out("key"));
}
+
+ @Override
+ public void _jspInit()
+ {
+ //
+ }
};
Context ctx = new DelegateContext();
Modified: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml 2009-03-09 22:47:19 UTC (rev 13005)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/conf/hibernate/workflow/hibernate.cfg.xml 2009-03-10 05:31:06 UTC (rev 13006)
@@ -15,10 +15,10 @@
<property name="hibernate.use_sql_comments">true</property>
<!-- caching properties -->
- <!-- todo: renable second level cache
- <property name="cache.use_second_level_cache">true</property>
- <property name="cache.use_query_cache">true</property>
- <property name="cache.provider_configuration_file_resource_path">conf/hibernate/workflow/ehcache.xml</property>
+ <!-- todo: renable second level cache -->
+ <property name="cache.use_second_level_cache">false</property>
+ <property name="cache.use_query_cache">false</property>
+<!-- <property name="cache.provider_configuration_file_resource_path">conf/hibernate/workflow/ehcache.xml</property>
<property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property> -->
<!-- managed environment transaction configuration -->
Modified: branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/portal-aop.xml
===================================================================
--- branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/portal-aop.xml 2009-03-09 22:47:19 UTC (rev 13005)
+++ branches/JBoss_Portal_AS5_Deployer/core/src/resources/portal-core-sar/portal-aop.xml 2009-03-10 05:31:06 UTC (rev 13006)
@@ -122,4 +122,15 @@
<application-exceptions>org.jboss.portal.portlet.InvalidPortletIdException</application-exceptions>
</method>
</metadata>
+
+ <!-- enable aop transactions -->
+ <interceptor factory="org.jboss.aspects.tx.TxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
+ <bind pointcut="all(@transaction)">
+ <interceptor-ref name="org.jboss.aspects.tx.TxInterceptorFactory"/>
+ </bind>
+ <bind pointcut="all((a)org.jboss.aspects.tx.Tx)">
+ <interceptor-ref name="org.jboss.aspects.tx.TxInterceptorFactory"/>
+ </bind>
+ <!-- -->
+
</aop>
17 years, 1 month
JBoss Portal SVN: r13005 - in modules/authorization/trunk: http-profile and 8 other directories.
by portal-commits@lists.jboss.org
Author: sohil.shah(a)jboss.com
Date: 2009-03-09 18:47:19 -0400 (Mon, 09 Mar 2009)
New Revision: 13005
Added:
modules/authorization/trunk/http-profile/src/main/java/org/jboss/security/authz/http/enforcement/
modules/authorization/trunk/http-profile/src/main/java/org/jboss/security/authz/http/enforcement/SecurityFilter.java
modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/container/
modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/container/TestHelloWorldHttpServlet.java
modules/authorization/trunk/http-profile/src/test/resources/httpprofile-testsuite.war/
modules/authorization/trunk/http-profile/src/test/resources/httpprofile-testsuite.war/WEB-INF/
modules/authorization/trunk/http-profile/src/test/resources/httpprofile-testsuite.war/WEB-INF/classes/
modules/authorization/trunk/http-profile/src/test/resources/httpprofile-testsuite.war/WEB-INF/http-policy.xml
modules/authorization/trunk/http-profile/src/test/resources/httpprofile-testsuite.war/WEB-INF/lib/
modules/authorization/trunk/http-profile/src/test/resources/httpprofile-testsuite.war/WEB-INF/web.xml
modules/authorization/trunk/http-profile/src/test/resources/httpprofile-testsuite.war/index.html
Modified:
modules/authorization/trunk/.classpath
modules/authorization/trunk/http-profile/pom.xml
modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/Server.java
modules/authorization/trunk/pom.xml
Log:
code backup
Modified: modules/authorization/trunk/.classpath
===================================================================
--- modules/authorization/trunk/.classpath 2009-03-09 14:37:28 UTC (rev 13004)
+++ modules/authorization/trunk/.classpath 2009-03-09 22:47:19 UTC (rev 13005)
@@ -38,5 +38,6 @@
<classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-kernel/2.0.2.GA/jboss-kernel-2.0.2.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/microcontainer/jboss-dependency/2.0.2.GA/jboss-dependency-2.0.2.GA.jar"/>
<classpathentry kind="var" path="M2_REPO/org/jboss/jboss-common-core/2.2.9.GA/jboss-common-core-2.2.9.GA.jar"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar"/>
<classpathentry kind="output" path="bin"/>
</classpath>
Modified: modules/authorization/trunk/http-profile/pom.xml
===================================================================
--- modules/authorization/trunk/http-profile/pom.xml 2009-03-09 14:37:28 UTC (rev 13004)
+++ modules/authorization/trunk/http-profile/pom.xml 2009-03-09 22:47:19 UTC (rev 13005)
@@ -28,6 +28,10 @@
<groupId>org.jboss.security.authz</groupId>
<artifactId>policy-server</artifactId>
<version>${project.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
</dependency>
<!-- test dependencies -->
@@ -62,11 +66,255 @@
<groupId>org.apache.maven.plugins</groupId>
<artifactId>maven-surefire-plugin</artifactId>
<version>2.3.1</version>
- <configuration>
- <includes>
- </includes>
+ <configuration>
+ <includes>
+ <include>**/components/Test*.java</include>
+ <include>**/provisioning/Test*.java</include>
+ </includes>
</configuration>
- </plugin>
+ </plugin>
</plugins>
- </build>
+ </build>
+
+ <profiles>
+ <profile>
+ <id>container-testsuite</id>
+ <build>
+ <plugins>
+ <!--
+ Generate test artifacts to be deployed for testing into the container
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-antrun-plugin</artifactId>
+ <version>1.3</version>
+ <executions>
+ <execution>
+ <id>generate-test-artifacts</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>run</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <tasks>
+ <echo>Generating Test Artifacts...</echo>
+ <copy todir="target/test-classes/httpprofile-testsuite.war/WEB-INF/classes" overwrite="true">
+ <fileset dir="target/classes"/>
+ </copy>
+ </tasks>
+ </configuration>
+ </plugin>
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-dependency-plugin</artifactId>
+ <executions>
+ <execution>
+ <id>dependency-copying</id>
+ <phase>test-compile</phase>
+ <goals>
+ <goal>copy</goal>
+ </goals>
+ <configuration>
+ <artifactItems>
+ <artifactItem>
+ <groupId>org.jboss.security.authz</groupId>
+ <artifactId>common-api</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/test-classes/httpprofile-testsuite.war/WEB-INF/lib</outputDirectory>
+ <destFileName>common-api.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.security.authz</groupId>
+ <artifactId>core-components-api</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/test-classes/httpprofile-testsuite.war/WEB-INF/lib</outputDirectory>
+ <destFileName>core-components.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.security.authz</groupId>
+ <artifactId>policy-server</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/test-classes/httpprofile-testsuite.war/WEB-INF/lib</outputDirectory>
+ <destFileName>policy-server.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.security.authz</groupId>
+ <artifactId>enforcement</artifactId>
+ <version>${project.version}</version>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/test-classes/httpprofile-testsuite.war/WEB-INF/lib</outputDirectory>
+ <destFileName>enforcement.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-xacml</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/test-classes/httpprofile-testsuite.war/WEB-INF/lib</outputDirectory>
+ <destFileName>jboss-xacml.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.security</groupId>
+ <artifactId>jboss-sunxacml</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/test-classes/httpprofile-testsuite.war/WEB-INF/lib</outputDirectory>
+ <destFileName>jboss-sunxacml.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-core</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/test-classes/httpprofile-testsuite.war/WEB-INF/lib</outputDirectory>
+ <destFileName>drools-core.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.drools</groupId>
+ <artifactId>drools-compiler</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/test-classes/httpprofile-testsuite.war/WEB-INF/lib</outputDirectory>
+ <destFileName>drools-compiler.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.mvel</groupId>
+ <artifactId>mvel</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/test-classes/httpprofile-testsuite.war/WEB-INF/lib</outputDirectory>
+ <destFileName>mvel.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr-runtime</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/test-classes/httpprofile-testsuite.war/WEB-INF/lib</outputDirectory>
+ <destFileName>antlr-runtime.jar</destFileName>
+ </artifactItem>
+
+ <!--
+ Not needed for testing on JBoss5x
+ <artifactItem>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-kernel</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/test-classes/httpprofile-testsuite.war/WEB-INF/lib</outputDirectory>
+ <destFileName>jboss-kernel.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/test-classes/httpprofile-testsuite.war/WEB-INF/lib</outputDirectory>
+ <destFileName>jboss-dependency.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/test-classes/httpprofile-testsuite.war/WEB-INF/lib</outputDirectory>
+ <destFileName>jboss-reflect.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/test-classes/httpprofile-testsuite.war/WEB-INF/lib</outputDirectory>
+ <destFileName>jboss-common-core.jar</destFileName>
+ </artifactItem>
+ <artifactItem>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <type>jar</type>
+ <overWrite>true</overWrite>
+ <outputDirectory>target/test-classes/httpprofile-testsuite.war/WEB-INF/lib</outputDirectory>
+ <destFileName>jboss-mdr.jar</destFileName>
+ </artifactItem>
+ -->
+ </artifactItems>
+ </configuration>
+ </execution>
+ </executions>
+ </plugin>
+
+
+ <!--
+ Loads the container and all test artifacts before the container-testsuite is executed
+ -->
+ <plugin>
+ <groupId>org.codehaus.cargo</groupId>
+ <artifactId>cargo-maven2-plugin</artifactId>
+ <version>1.0-SNAPSHOT</version>
+ <executions>
+ <execution>
+ <id>start-container</id>
+ <phase>process-test-classes</phase>
+ <goals>
+ <goal>start</goal>
+ </goals>
+ </execution>
+ <execution>
+ <id>stop-container</id>
+ <phase>test</phase>
+ <goals>
+ <goal>stop</goal>
+ </goals>
+ </execution>
+ </executions>
+ <configuration>
+ <wait>false</wait>
+
+ <container>
+ <containerId>jboss5x</containerId>
+ <home>${jboss.home}</home>
+ </container>
+
+ <configuration>
+ <properties>
+ <cargo.jboss.configuration>cargo</cargo.jboss.configuration>
+ </properties>
+
+ <deployables>
+ <deployable>
+ <location>target/test-classes/httpprofile-testsuite.war</location>
+ <pingURL>http://localhost:8080/httpprofile-testsuite/index.html</pingURL>
+ <type>war</type>
+ </deployable>
+ </deployables>
+ </configuration>
+ </configuration>
+ </plugin>
+
+ <!--
+ Consists of all tests that should be run as part of the container-testsuite
+ -->
+ <plugin>
+ <groupId>org.apache.maven.plugins</groupId>
+ <artifactId>maven-surefire-plugin</artifactId>
+ <version>2.3.1</version>
+ <configuration>
+ <includes>
+ <include>**/container/Test*.java</include>
+ </includes>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+ </profile>
+ </profiles>
</project>
\ No newline at end of file
Added: modules/authorization/trunk/http-profile/src/main/java/org/jboss/security/authz/http/enforcement/SecurityFilter.java
===================================================================
--- modules/authorization/trunk/http-profile/src/main/java/org/jboss/security/authz/http/enforcement/SecurityFilter.java (rev 0)
+++ modules/authorization/trunk/http-profile/src/main/java/org/jboss/security/authz/http/enforcement/SecurityFilter.java 2009-03-09 22:47:19 UTC (rev 13005)
@@ -0,0 +1,119 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+package org.jboss.security.authz.http.enforcement;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.UnavailableException;
+
+import org.apache.log4j.Logger;
+
+import org.jboss.security.authz.http.configuration.HttpPolicyConfig;
+import org.jboss.security.authz.model.Policy;
+import org.jboss.security.authz.policy.server.Server;
+import org.jboss.security.authz.policy.server.PolicyServer;
+import org.jboss.security.authz.policy.server.spi.PolicyConfig;
+import org.jboss.security.authz.tools.GeneralTool;
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ */
+public class SecurityFilter implements Filter
+{
+ private static Logger log = Logger.getLogger(SecurityFilter.class);
+
+ private PolicyServer policyServer;
+
+ public SecurityFilter()
+ {
+
+ }
+ //-Filter implementation-------------------------------------------------------------------------------------------------------------------------------------------------------------------
+ public void init(FilterConfig config) throws ServletException
+ {
+ InputStream is = null;
+ try
+ {
+ //Start the Policy Server
+ Server.bootstrap();
+ this.policyServer = (PolicyServer)Server.lookup("/policy-server/PolicyServer");
+
+ if(this.policyServer == null)
+ {
+ throw new RuntimeException("Policy Server is unavailable...");
+ }
+
+ //Parse the specified Policy and update the Policy Server
+ PolicyConfig policyConfig = new HttpPolicyConfig();
+
+ is = config.getServletContext().getResourceAsStream("/WEB-INF/http-policy.xml");
+
+ Policy[] policies = policyConfig.configure(GeneralTool.readStream(is));
+
+ log.debug("----------------------------------------------------------");
+ for(Policy policy: policies)
+ {
+ log.debug(policy.generateXACMLPolicy());
+ this.policyServer.newPolicy(policy.getMetaData());
+ }
+ log.debug("----------------------------------------------------------");
+
+ log.info("----------------------------------------------------------");
+ log.info("Security Filter successfully initialized...................");
+ log.info("----------------------------------------------------------");
+ }
+ catch(Exception e)
+ {
+ log.error(this, e);
+ throw new UnavailableException("Error occured while processing the Http Policy: "+e.getMessage());
+ }
+ finally
+ {
+ if(is != null)
+ {
+ try
+ {
+ is.close();
+ }catch(IOException ioe){}
+ }
+ }
+ }
+
+ public void destroy()
+ {
+ }
+
+ public void doFilter(ServletRequest request, ServletResponse response, FilterChain chain) throws IOException, ServletException
+ {
+ log.info("--------------------------------------------------------");
+ log.info("Security Filter successfully called.....................");
+
+ chain.doFilter(request, response);
+ }
+}
Added: modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/container/TestHelloWorldHttpServlet.java
===================================================================
--- modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/container/TestHelloWorldHttpServlet.java (rev 0)
+++ modules/authorization/trunk/http-profile/src/test/java/org/jboss/security/authz/http/container/TestHelloWorldHttpServlet.java 2009-03-09 22:47:19 UTC (rev 13005)
@@ -0,0 +1,54 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.security.authz.http.container;
+
+import junit.framework.TestCase;
+
+import org.apache.log4j.Logger;
+
+/**
+ * @author <a href="mailto:sshah@redhat.com">Sohil Shah</a>
+ *
+ */
+public class TestHelloWorldHttpServlet extends TestCase
+{
+ /**
+ *
+ */
+ private static Logger log = Logger.getLogger(TestHelloWorldHttpServlet.class);
+
+
+ /**
+ *
+ */
+ protected void setUp() throws Exception
+ {
+
+ }
+ //------------------------------------------------------------------------------------------------------------------------------------------------------
+ public void testHelloWorld() throws Exception
+ {
+ String url = "/httpprofile-testsuite/index.html";
+ Thread.currentThread().sleep(20000);
+ }
+}
Added: modules/authorization/trunk/http-profile/src/test/resources/httpprofile-testsuite.war/WEB-INF/http-policy.xml
===================================================================
--- modules/authorization/trunk/http-profile/src/test/resources/httpprofile-testsuite.war/WEB-INF/http-policy.xml (rev 0)
+++ modules/authorization/trunk/http-profile/src/test/resources/httpprofile-testsuite.war/WEB-INF/http-policy.xml 2009-03-09 22:47:19 UTC (rev 13005)
@@ -0,0 +1,50 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<web-security>
+ <security-constraint>
+ <web-resource-collection>
+ <web-resource>
+ <web-resource-name>Executive Files</web-resource-name>
+ <url-pattern>/private/executives/*</url-pattern>
+ <parameters>
+ <parameter name="id">1234</parameter>
+ </parameters>
+ </web-resource>
+ <web-resource>
+ <web-resource-name>Board/Investor Files</web-resource-name>
+ <url-pattern>/private/board/*</url-pattern>
+ <parameters>
+ <parameter name="id">5678</parameter>
+ </parameters>
+ </web-resource>
+ </web-resource-collection>
+ <auth-constraint>
+ <!-- constaints based on user roles -->
+ <roles allow="true">
+ <role-name>Admin</role-name>
+ <role-name>Executive</role-name>
+ </roles>
+ <roles allow="false">
+ <role-name>Manager</role-name>
+ <role-name>Developer</role-name>
+ </roles>
+
+ <!-- constants based on ip address of the connecting machine -->
+ <!--
+ Still need to implement this functionality
+ <ip-address allow="true">
+ <ip-range>
+ <address-from></address-from>
+ <address-to></address-to>
+ </ip-range>
+ </ip-address>
+ <ip-address allow="false">
+ <ip-range>
+ <address-from></address-from>
+ <address-to></address-to>
+ </ip-range>
+ </ip-address>
+ -->
+ <!-- constraints based on data and/or time -->
+ </auth-constraint>
+ </security-constraint>
+</web-security>
\ No newline at end of file
Added: modules/authorization/trunk/http-profile/src/test/resources/httpprofile-testsuite.war/WEB-INF/web.xml
===================================================================
--- modules/authorization/trunk/http-profile/src/test/resources/httpprofile-testsuite.war/WEB-INF/web.xml (rev 0)
+++ modules/authorization/trunk/http-profile/src/test/resources/httpprofile-testsuite.war/WEB-INF/web.xml 2009-03-09 22:47:19 UTC (rev 13005)
@@ -0,0 +1,20 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app
+ PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+ "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+ <display-name>Http Profile Container TestSuite</display-name>
+ <description>Http Profile Container TestSuite</description>
+
+ <filter>
+ <filter-name>securityFilter</filter-name>
+ <filter-class>org.jboss.security.authz.http.enforcement.SecurityFilter</filter-class>
+ </filter>
+
+ <filter-mapping>
+ <filter-name>securityFilter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+</web-app>
Added: modules/authorization/trunk/http-profile/src/test/resources/httpprofile-testsuite.war/index.html
===================================================================
--- modules/authorization/trunk/http-profile/src/test/resources/httpprofile-testsuite.war/index.html (rev 0)
+++ modules/authorization/trunk/http-profile/src/test/resources/httpprofile-testsuite.war/index.html 2009-03-09 22:47:19 UTC (rev 13005)
@@ -0,0 +1,8 @@
+<html>
+ <head>
+ <title>Http Profile Container TestSuite</title>
+ </head>
+ <body>
+ <h1>Http Profile Container TestSuite</h1>
+ </body>
+</html>
\ No newline at end of file
Modified: modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/Server.java
===================================================================
--- modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/Server.java 2009-03-09 14:37:28 UTC (rev 13004)
+++ modules/authorization/trunk/policy-server/src/main/java/org/jboss/security/authz/policy/server/Server.java 2009-03-09 22:47:19 UTC (rev 13005)
@@ -24,6 +24,8 @@
import java.net.URL;
+import org.apache.log4j.Logger;
+
import org.jboss.kernel.Kernel;
import org.jboss.kernel.spi.dependency.KernelController;
import org.jboss.dependency.spi.ControllerContext;
@@ -34,6 +36,8 @@
*/
public final class Server
{
+ private static Logger log = Logger.getLogger(Server.class);
+
private static Kernel kernel;
public Server()
@@ -49,12 +53,14 @@
bootstrap.run();
URL url = Thread.currentThread().getContextClassLoader().getResource("META-INF/jboss-beans.xml");
+
bootstrap.deploy(url);
kernel = bootstrap.getKernel();
}
catch(Exception e)
{
+ log.error("org.jboss.security.authz.policy.server.Server", e);
throw new RuntimeException(e);
}
}
Modified: modules/authorization/trunk/pom.xml
===================================================================
--- modules/authorization/trunk/pom.xml 2009-03-09 14:37:28 UTC (rev 13004)
+++ modules/authorization/trunk/pom.xml 2009-03-09 22:47:19 UTC (rev 13005)
@@ -14,11 +14,12 @@
<module>core-components-api</module>
<module>enforcement</module>
<module>policy-server</module>
- <module>http-profile</module>
- <module>documentation</module>
+ <module>http-profile</module>
</modules>
<properties>
+ <!--
+ Not needed for nows
<version.jboss.seam>2.0.2.SP1</version.jboss.seam>
<version.facelets>1.1.14</version.facelets>
<version.ajax4jsf>1.1.1</version.ajax4jsf>
@@ -26,25 +27,30 @@
<version.hibernate>3.0.0.GA</version.hibernate>
<version.javax.persistence>1.0</version.javax.persistence>
<version.javax.ejb>3.0</version.javax.ejb>
- <version.javax.faces>1.2_04-p02</version.javax.faces>
+ <version.javax.faces>1.2_04-p02</version.javax.faces>
<version.commons-beanutils>1.6</version.commons-beanutils>
<version.commons-digester>1.6</version.commons-digester>
+ -->
+
<version.junit>3.8.2</version.junit>
<version.sun.jaxb>2.1.4</version.sun.jaxb>
<version.sun.jaf>1.1</version.sun.jaf>
<version.jboss.xacml>2.0.3-SNAPSHOT</version.jboss.xacml>
<version.apache.log4j>1.2.14</version.apache.log4j>
<version.org.drools>4.0.7</version.org.drools>
+ <version.org.mvel.mvel>1.3.1-java1.4</version.org.mvel.mvel>
+ <version.org.antlr>3.0</version.org.antlr>
+ <version.javax.servlet.servlet-api>2.4</version.javax.servlet.servlet-api>
<version.org.jboss.microcontainer>2.0.2.GA</version.org.jboss.microcontainer>
-
- <!-- local environment properties -->
- <jboss.home>/home/soshah/appServers/jboss-4.2.2.GA</jboss.home>
- <server.name>security</server.name>
+ <version.org.jboss.jboss-reflect>2.0.2.GA</version.org.jboss.jboss-reflect>
+ <version.org.jboss.jboss-common-core>2.2.9.GA</version.org.jboss.jboss-common-core>
+ <version.org.jboss.jboss-mdr>2.0.1.GA</version.org.jboss.jboss-mdr>
</properties>
<dependencyManagement>
<dependencies>
<!-- seam dependencies -->
+ <!--
<dependency>
<groupId>org.jboss.seam</groupId>
<artifactId>jboss-seam</artifactId>
@@ -75,8 +81,10 @@
<version>${version.commons-digester}</version>
<scope>provided</scope>
</dependency>
+ -->
<!-- richfaces dependencies -->
+ <!--
<dependency>
<groupId>org.ajax4jsf</groupId>
<artifactId>ajax4jsf</artifactId>
@@ -88,10 +96,12 @@
<artifactId>richfaces</artifactId>
<version>${version.richfaces}</version>
<scope>provided</scope>
- </dependency>
+ </dependency>
+ -->
<!-- dependencies provided by the runtime -->
+ <!--
<dependency>
<groupId>org.hibernate</groupId>
<artifactId>hibernate-validator</artifactId>
@@ -116,6 +126,7 @@
<version>${version.javax.faces}</version>
<scope>provided</scope>
</dependency>
+ -->
<!-- sun jaxb -->
<dependency>
@@ -198,6 +209,18 @@
<artifactId>xercesImpl</artifactId>
</exclusion>
</exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.mvel</groupId>
+ <artifactId>mvel</artifactId>
+ <version>${version.org.mvel.mvel}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.antlr</groupId>
+ <artifactId>antlr-runtime</artifactId>
+ <version>${version.org.antlr}</version>
+ <scope>provided</scope>
</dependency>
<!-- JBoss Microcontainer -->
@@ -207,6 +230,38 @@
<version>${version.org.jboss.microcontainer}</version>
<scope>provided</scope>
</dependency>
+ <dependency>
+ <groupId>org.jboss.microcontainer</groupId>
+ <artifactId>jboss-dependency</artifactId>
+ <version>${version.org.jboss.microcontainer}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-reflect</artifactId>
+ <version>${version.org.jboss.jboss-reflect}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-common-core</artifactId>
+ <version>${version.org.jboss.jboss-common-core}</version>
+ <scope>provided</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.jboss</groupId>
+ <artifactId>jboss-mdr</artifactId>
+ <version>${version.org.jboss.jboss-mdr}</version>
+ <scope>provided</scope>
+ </dependency>
+
+ <!-- Servlet -->
+ <dependency>
+ <groupId>javax.servlet</groupId>
+ <artifactId>servlet-api</artifactId>
+ <version>${version.javax.servlet.servlet-api}</version>
+ <scope>provided</scope>
+ </dependency>
</dependencies>
</dependencyManagement>
@@ -297,6 +352,13 @@
<enabled>true</enabled>
</snapshots>
</pluginRepository>
+ <pluginRepository>
+ <id>codehaus snapshot repository</id>
+ <url>http://snapshots.repository.codehaus.org/</url>
+ <releases>
+ <enabled>true</enabled>
+ </releases>
+ </pluginRepository>
</pluginRepositories>
<distributionManagement>
@@ -312,5 +374,18 @@
<url>dav:https://snapshots.jboss.org/maven2</url>
<uniqueVersion>true</uniqueVersion>
</snapshotRepository>
- </distributionManagement>
+ </distributionManagement>
+
+ <!-- Build Profiles -->
+ <profiles>
+ <profile>
+ <id>container-testsuite</id>
+ <properties>
+ <!--
+ <jboss.home>/home/soshah/projects/jboss-portal/jboss-4.2.3.GA</jboss.home>
+ -->
+ <jboss.home>/home/soshah/projects/jboss-portal/jboss-5.0.1.GA</jboss.home>
+ </properties>
+ </profile>
+ </profiles>
</project>
17 years, 1 month
JBoss Portal SVN: r13004 - tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war.
by portal-commits@lists.jboss.org
Author: wesleyhales
Date: 2009-03-09 10:37:28 -0400 (Mon, 09 Mar 2009)
New Revision: 13004
Modified:
tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war/login.jsp
Log:
remove validation from login box
Modified: tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war/login.jsp
===================================================================
--- tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war/login.jsp 2009-03-09 14:35:19 UTC (rev 13003)
+++ tags/JBoss_Portal_2_7_2/core/src/resources/portal-server-war/login.jsp 2009-03-09 14:37:28 UTC (rev 13004)
@@ -39,7 +39,7 @@
<link rel="stylesheet" href="/portal-core/css/login.css" type="text/css"/>
</head>
-<body onload="JBossPortal.login.setFocusOnLoginForm();JBossPortal.login.displayStatus();JBossPortal.login.validate(10);">
+<body onload="JBossPortal.login.setFocusOnLoginForm();JBossPortal.login.displayStatus();">
<div class="login-container">
@@ -69,12 +69,12 @@
<div class="form-field">
<label for="j_username"><%= rb.getString("LOGIN_USERNAME") %>
</label>
- <input type="text" style="width:155px;" name="j_username" id="j_username" value="" onkeyup="JBossPortal.login.validate();" onFocus="JBossPortal.login.highlight('j_username');" onblur="JBossPortal.login.highlight('j_username');"/>
+ <input type="text" style="width:155px;" name="j_username" id="j_username" value="" onFocus="JBossPortal.login.highlight('j_username');" onblur="JBossPortal.login.highlight('j_username');"/>
</div>
<div class="form-field">
<label for="j_password"><%= rb.getString("LOGIN_PASSWORD") %>
</label>
- <input type="password" style="width:155px;" name="j_password" id="j_password" value="" onkeyup="JBossPortal.login.validate();" onFocus="JBossPortal.login.highlight('j_password');" onblur="JBossPortal.login.highlight('j_password');"/>
+ <input type="password" style="width:155px;" name="j_password" id="j_password" value="" onFocus="JBossPortal.login.highlight('j_password');" onblur="JBossPortal.login.highlight('j_password');"/>
</div>
<br class="clear"/>
17 years, 1 month
JBoss Portal SVN: r13003 - in docs/tags/JBoss_Portal_2_6_8: referenceGuide/en and 2 other directories.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-03-09 10:35:19 -0400 (Mon, 09 Mar 2009)
New Revision: 13003
Modified:
docs/tags/JBoss_Portal_2_6_8/quickstartuser/en/master.xml
docs/tags/JBoss_Portal_2_6_8/referenceGuide/en/master.xml
docs/tags/JBoss_Portal_2_6_8/referenceGuide/en/modules/installation.xml
docs/tags/JBoss_Portal_2_6_8/userGuide/en/master.xml
Log:
2.6.8
Modified: docs/tags/JBoss_Portal_2_6_8/quickstartuser/en/master.xml
===================================================================
--- docs/tags/JBoss_Portal_2_6_8/quickstartuser/en/master.xml 2009-03-09 14:26:02 UTC (rev 13002)
+++ docs/tags/JBoss_Portal_2_6_8/quickstartuser/en/master.xml 2009-03-09 14:35:19 UTC (rev 13003)
@@ -11,9 +11,9 @@
]>
<book lang="en">
<bookinfo>
- <title>JBoss Portal 2.6.6</title>
+ <title>JBoss Portal 2.6.8</title>
<subtitle>Quickstart User Guide</subtitle>
- <releaseinfo>Release 2.6.6</releaseinfo>
+ <releaseinfo>Release 2.6.8</releaseinfo>
<author>
<firstname>Kevin</firstname>
Modified: docs/tags/JBoss_Portal_2_6_8/referenceGuide/en/master.xml
===================================================================
--- docs/tags/JBoss_Portal_2_6_8/referenceGuide/en/master.xml 2009-03-09 14:26:02 UTC (rev 13002)
+++ docs/tags/JBoss_Portal_2_6_8/referenceGuide/en/master.xml 2009-03-09 14:35:19 UTC (rev 13003)
@@ -38,10 +38,10 @@
]>
<book lang="en">
<bookinfo>
- <title><trademark class="registered">JBoss</trademark> Portal 2.6.6</title>
+ <title><trademark class="registered">JBoss</trademark> Portal 2.6.8</title>
<subtitle>Reference Guide</subtitle>
- <releaseinfo>Release 2.6.6</releaseinfo>
- <releaseinfo>July 2008</releaseinfo>
+ <releaseinfo>Release 2.6.8</releaseinfo>
+ <releaseinfo>March 2009</releaseinfo>
<author>
<firstname>Thomas</firstname>
<surname>Heute</surname>
Modified: docs/tags/JBoss_Portal_2_6_8/referenceGuide/en/modules/installation.xml
===================================================================
--- docs/tags/JBoss_Portal_2_6_8/referenceGuide/en/modules/installation.xml 2009-03-09 14:26:02 UTC (rev 13002)
+++ docs/tags/JBoss_Portal_2_6_8/referenceGuide/en/modules/installation.xml 2009-03-09 14:35:19 UTC (rev 13003)
@@ -261,7 +261,7 @@
<itemizedlist>
<listitem>
<para>
- JBoss Portal Common 1.1.1: <emphasis>http://anonsvn.jboss.org/repos/portal/modules/common/tags/JBP_COMMON_1_1_1</emphasis>
+ JBoss Portal Common 1.1.3: <emphasis>http://anonsvn.jboss.org/repos/portal/modules/common/tags/JBP_COMMON_1_1_3</emphasis>
</para>
</listitem>
<listitem>
@@ -271,7 +271,7 @@
</listitem>
<listitem>
<para>
- JBoss Portal Test 1.0.1: <emphasis>http://anonsvn.jboss.org/repos/portal/modules/test/tags/JBP_TEST_1_0_1</emphasis>
+ JBoss Portal Test 1.0.1 SP2: <emphasis>http://anonsvn.jboss.org/repos/portal/modules/test/tags/JBP_TEST_1_0_1_SP2</emphasis>
</para>
</listitem>
<listitem>
@@ -281,7 +281,7 @@
</listitem>
<listitem>
<para>
- JBoss Portal Identity 1.0.3: <emphasis>http://anonsvn.jboss.org/repos/portal/modules/identity/tags/JBP_IDENTITY_...</emphasis>
+ JBoss Portal Identity 1.0.8: <emphasis>http://anonsvn.jboss.org/repos/portal/modules/identity/tags/JBP_IDENTITY_...</emphasis>
</para>
</listitem>
</itemizedlist>
Modified: docs/tags/JBoss_Portal_2_6_8/userGuide/en/master.xml
===================================================================
--- docs/tags/JBoss_Portal_2_6_8/userGuide/en/master.xml 2009-03-09 14:26:02 UTC (rev 13002)
+++ docs/tags/JBoss_Portal_2_6_8/userGuide/en/master.xml 2009-03-09 14:35:19 UTC (rev 13003)
@@ -13,10 +13,10 @@
]>
<book lang="en">
<bookinfo>
- <title>JBoss Portal 2.6.5</title>
+ <title>JBoss Portal 2.6.8</title>
<subtitle>User Guide</subtitle>
- <releaseinfo>Release 2.6.5</releaseinfo>
- <releaseinfo>May 2008</releaseinfo>
+ <releaseinfo>Release 2.6.8</releaseinfo>
+ <releaseinfo>March 2009</releaseinfo>
</bookinfo>
<toc/>
<!-- portal overview - marketing stuff --> &overview;
17 years, 1 month
JBoss Portal SVN: r13002 - branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war.
by portal-commits@lists.jboss.org
Author: wesleyhales
Date: 2009-03-09 10:26:02 -0400 (Mon, 09 Mar 2009)
New Revision: 13002
Modified:
branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp
Log:
remove validation from login page
Modified: branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp
===================================================================
--- branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2009-03-09 14:25:54 UTC (rev 13001)
+++ branches/JBoss_Portal_Branch_2_7/core/src/resources/portal-server-war/login.jsp 2009-03-09 14:26:02 UTC (rev 13002)
@@ -39,7 +39,7 @@
<link rel="stylesheet" href="/portal-core/css/login.css" type="text/css"/>
</head>
-<body onload="JBossPortal.login.setFocusOnLoginForm();JBossPortal.login.displayStatus();JBossPortal.login.validate(10);">
+<body onload="JBossPortal.login.setFocusOnLoginForm();JBossPortal.login.displayStatus();">
<div class="login-container">
@@ -69,12 +69,12 @@
<div class="form-field">
<label for="j_username"><%= rb.getString("LOGIN_USERNAME") %>
</label>
- <input type="text" style="width:155px;" name="j_username" id="j_username" value="" onkeyup="JBossPortal.login.validate();" onFocus="JBossPortal.login.highlight('j_username');" onblur="JBossPortal.login.highlight('j_username');"/>
+ <input type="text" style="width:155px;" name="j_username" id="j_username" value="" onFocus="JBossPortal.login.highlight('j_username');" onblur="JBossPortal.login.highlight('j_username');"/>
</div>
<div class="form-field">
<label for="j_password"><%= rb.getString("LOGIN_PASSWORD") %>
</label>
- <input type="password" style="width:155px;" name="j_password" id="j_password" value="" onkeyup="JBossPortal.login.validate();" onFocus="JBossPortal.login.highlight('j_password');" onblur="JBossPortal.login.highlight('j_password');"/>
+ <input type="password" style="width:155px;" name="j_password" id="j_password" value="" onFocus="JBossPortal.login.highlight('j_password');" onblur="JBossPortal.login.highlight('j_password');"/>
</div>
<br class="clear"/>
17 years, 1 month
JBoss Portal SVN: r13001 - docs/tags.
by portal-commits@lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2009-03-09 10:25:54 -0400 (Mon, 09 Mar 2009)
New Revision: 13001
Added:
docs/tags/JBoss_Portal_2_6_8/
Log:
Tagging JBoss Portal 2.6.8 docs
Copied: docs/tags/JBoss_Portal_2_6_8 (from rev 13000, docs/branches/JBoss_Portal_Branch_2_6)
17 years, 1 month