JBoss Portal SVN: r6996 - trunk/build.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-18 04:40:28 -0400 (Wed, 18 Apr 2007)
New Revision: 6996
Modified:
trunk/build/distrib.xml
Log:
improved a bit the distrib build file
Modified: trunk/build/distrib.xml
===================================================================
--- trunk/build/distrib.xml 2007-04-18 00:15:31 UTC (rev 6995)
+++ trunk/build/distrib.xml 2007-04-18 08:40:28 UTC (rev 6996)
@@ -1,7 +1,7 @@
<project default="main" name="JBoss Portal">
<property name="source.dir" value="../../jboss-portal-2.6"/>
- <property name="release.version" value="2.6-BETA1"/>
+ <property name="release.version" value="2.6-CR1"/>
<!-- -->
<property name="portal.release.normal.name" value="jboss-portal-${release.version}"/>
@@ -147,7 +147,7 @@
</target>
<!-- -->
- <target name="package" if="jboss.home">
+ <target name="package">
<!-- Create the output directory -->
<mkdir dir="output"/>
@@ -176,11 +176,11 @@
<antcall target="package-normal"/>
<antcall target="package-ha"/>
- <antcall target="package-normal-bundled"/>
+ <antcall target="package-normal"/>
<antcall target="package-ha-bundled"/>
</target>
-
+
<!--
| JBoss Portal binary distribution
-->
@@ -197,16 +197,15 @@
<fileset dir="${source.dir}/core-cms/output/resources/portal-cms.sar" includes="**"/>
</copy>
<copy todir="${portal.build.normal.bin}/jboss-portal.sar">
+ <fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/>
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-samples.sar/**"/>
<fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/>
<fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/>
</copy>
-<!--
<mkdir dir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar"/>
<copy todir="${portal.build.normal.bin}/jboss-portal.sar/portal-wsrp.sar">
<fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/>
</copy>
--->
</target>
<!--
@@ -224,23 +223,22 @@
<fileset dir="${source.dir}/core-cms/output/resources/portal-cms-ha.sar" includes="**"/>
</copy>
<copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar">
+ <fileset dir="${source.dir}/widget/output/resources" includes="widget.war/**"/>
<fileset dir="${source.dir}/core-samples/output/resources" includes="portal-samples.sar/**"/>
<fileset dir="${source.dir}/core-management/output/resources" includes="portal-management.sar/**"/>
<fileset dir="${source.dir}/core-admin/output/resources" includes="portal-admin.sar/**"/>
</copy>
-<!--
<mkdir dir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar"/>
<copy todir="${portal.build.ha.bin}/jboss-portal-ha.sar/portal-wsrp.sar">
<fileset dir="${source.dir}/wsrp/output/lib/portal-wsrp-exploded.sar"/>
</copy>
--->
<copy file="${source.dir}-docs/readmeFiles/jboss-portal-ha-bin.README" todir="${portal.build.ha.bin}"/>
</target>
<!--
| JBoss Portal bundled distribution
-->
- <target name="package-normal-bundled" depends="package-normal" if="jboss.home" description="package jboss-portal bundled with jboss AS ">
+ <target name="package-normal-bundled" depends="package-normal" if="jboss.home" description="package jboss-portal bundled with JBoss AS">
<mkdir dir="${portal.build.normal.bundled}"/>
<antcall target="package-bundled">
<param name="todir" value="${portal.build.normal.bundled}"/>
@@ -266,7 +264,7 @@
| JBoss Portal ha bundled distribution
-->
- <target name="package-ha-bundled" depends="package-ha" if="jboss.home" description="package jboss-portal-ha bundled with jboss AS ">
+ <target name="package-ha-bundled" depends="package-ha" if="jboss.home" description="package jboss-portal-ha bundled with JBoss AS">
<mkdir dir="${portal.build.ha.bundled}"/>
<antcall target="package-bundled">
<param name="todir" value="${portal.build.ha.bundled}"/>
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r6995 - in trunk/wsrp/src/main/org/jboss/portal: test/wsrp/framework/support and 3 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-04-17 20:15:31 -0400 (Tue, 17 Apr 2007)
New Revision: 6995
Modified:
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockHttpSession.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPConsumer.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/EndpointConfigurationInfo.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java
Log:
- Removed get/setServiceFactory methods on WSRPConsumer and made it so that clients of WSRPConsumer should not be aware of ServiceFactory.
- Fixed tests.
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java 2007-04-17 22:03:45 UTC (rev 6994)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/deployment/DeploymentTestCase.java 2007-04-18 00:15:31 UTC (rev 6995)
@@ -33,8 +33,6 @@
import org.jboss.portal.wsrp.core.RegistrationData;
import org.jboss.portal.wsrp.deployment.WSRPDeployment;
import org.jboss.portal.wsrp.deployment.WSRPDeploymentFactory;
-import org.jboss.portal.wsrp.services.PerEndpointSOAPInvokerServiceFactory;
-import org.jboss.portal.wsrp.services.RemoteSOAPInvokerServiceFactory;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
@@ -87,17 +85,10 @@
assertEquals(consumer.getProducerId(), info.getId());
EndpointConfigurationInfo endInfo = info.getEndpointConfigurationInfo();
assertNotNull(endInfo);
- assertNotNull(consumer.getServiceFactory());
- assertTrue(consumer.getServiceFactory() instanceof PerEndpointSOAPInvokerServiceFactory);
- PerEndpointSOAPInvokerServiceFactory serviceFactory = (PerEndpointSOAPInvokerServiceFactory)consumer.getServiceFactory();
- assertEquals("http://www.example.com", serviceFactory.getServiceDescriptionURL());
- assertEquals("http://www.example.com", serviceFactory.getMarkupURL());
- assertEquals("http://www.example.com", serviceFactory.getRegistrationURL());
- assertEquals("http://www.example.com", serviceFactory.getPortletManagementURL());
- assertEquals(endInfo.getServiceDescriptionURL(), serviceFactory.getServiceDescriptionURL());
- assertEquals(endInfo.getMarkupURL(), serviceFactory.getMarkupURL());
- assertEquals(endInfo.getRegistrationURL(), serviceFactory.getRegistrationURL());
- assertEquals(endInfo.getPortletManagementURL(), serviceFactory.getPortletManagementURL());
+ assertEquals("http://www.example.com", endInfo.getServiceDescriptionURL());
+ assertEquals("http://www.example.com", endInfo.getMarkupURL());
+ assertEquals("http://www.example.com", endInfo.getRegistrationURL());
+ assertEquals("http://www.example.com", endInfo.getPortletManagementURL());
// inDB2 is active and configured from the DB (configured in MockConsumerRegistry)
consumer = (WSRPConsumer)services.get(1);
@@ -114,7 +105,6 @@
assertEquals("producer1", consumer.getProducerId());
info = consumer.getProducerInfo();
assertEquals(120, info.getExpirationCacheSeconds().intValue());
- assertTrue(consumer.getServiceFactory() instanceof RemoteSOAPInvokerServiceFactory);
endInfo = info.getEndpointConfigurationInfo();
assertNotNull(endInfo);
assertTrue(endInfo.usesWSDL());
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockHttpSession.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockHttpSession.java 2007-04-17 22:03:45 UTC (rev 6994)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/framework/support/MockHttpSession.java 2007-04-18 00:15:31 UTC (rev 6995)
@@ -66,6 +66,10 @@
{
return "MockHttpSession";
}
+ else if ("getId".equals(methodName))
+ {
+ return "SESSION_ID";
+ }
else
{
throw new UnsupportedOperationException("MockHttpSession does not support: " + method);
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPConsumer.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPConsumer.java 2007-04-17 22:03:45 UTC (rev 6994)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/WSRPConsumer.java 2007-04-18 00:15:31 UTC (rev 6995)
@@ -28,7 +28,6 @@
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.wsrp.consumer.ProducerInfo;
import org.jboss.portal.wsrp.consumer.ProducerSessionInformation;
-import org.jboss.portal.wsrp.services.ServiceFactory;
import org.jboss.system.Service;
import javax.servlet.http.HttpSession;
@@ -49,21 +48,6 @@
String getProducerId();
/**
- * Sets the ServiceFactory this Consumer will use to access the associated Producer's services. Required for wiring
- * of services.
- *
- * @param serviceFactory the ServiceFactory this Consumer will use to access the associated Producer's services.
- */
- void setServiceFactory(ServiceFactory serviceFactory);
-
- /**
- * Retrieves the ServiceFactory this Consumer will use to access the associated Producer's services.
- *
- * @return the ServiceFactory this Consumer will use to access the associated Producer's services.
- */
- ServiceFactory getServiceFactory();
-
- /**
* Retrieves the session information for the producer associated with this consumer.
*
* @param invocation a portlet invocation from which the session information should be extracted.
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/EndpointConfigurationInfo.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/EndpointConfigurationInfo.java 2007-04-17 22:03:45 UTC (rev 6994)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/EndpointConfigurationInfo.java 2007-04-18 00:15:31 UTC (rev 6995)
@@ -233,6 +233,16 @@
}
+ public void start() throws Exception
+ {
+ getServiceFactory().start();
+ }
+
+ public void stop() throws Exception
+ {
+ getServiceFactory().stop();
+ }
+
public ServiceFactory getServiceFactory()
{
initServiceFactoryIfNeeded();
@@ -288,4 +298,16 @@
+ e.getLocalizedMessage(), e);
}
}
+
+ public boolean isAvailable()
+ {
+ try
+ {
+ return getServiceFactory().isAvailable();
+ }
+ catch (Exception e)
+ {
+ return false;
+ }
+ }
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java 2007-04-17 22:03:45 UTC (rev 6994)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/consumer/WSRPConsumerImpl.java 2007-04-18 00:15:31 UTC (rev 6995)
@@ -474,7 +474,7 @@
log.info("Consumer with id '" + getProducerId() + "' activated");
}
- producerInfo.setActive(getServiceFactory().isAvailable());
+ producerInfo.setActive(getEndpointConfigurationInfo().isAvailable());
}
public void deactivate() throws Exception
@@ -492,14 +492,14 @@
protected void startService() throws Exception
{
super.startService();
- getServiceFactory().start();
+ getEndpointConfigurationInfo().start();
started = true;
log.info("Consumer with id '" + getProducerId() + "' started");
}
protected void stopService() throws Exception
{
- getServiceFactory().stop();
+ getEndpointConfigurationInfo().stop();
super.stopService();
started = false;
log.info("Consumer with id '" + getProducerId() + "' stopped");
@@ -507,38 +507,43 @@
// Web services access **********************************************************************************************
- public ServiceFactory getServiceFactory()
+ /**
+ * Needed to wire Consumer tests.
+ *
+ * @param serviceFactory
+ */
+ public void setServiceFactory(ServiceFactory serviceFactory)
{
- return producerInfo.getEndpointConfigurationInfo().getServiceFactory();
+ getEndpointConfigurationInfo().setServiceFactory(serviceFactory);
}
- public void setServiceFactory(ServiceFactory serviceFactory)
+ private EndpointConfigurationInfo getEndpointConfigurationInfo()
{
- producerInfo.getEndpointConfigurationInfo().setServiceFactory(serviceFactory);
+ return producerInfo.getEndpointConfigurationInfo();
}
public WSRP_v1_ServiceDescription_PortType getServiceDescriptionService() throws PortletInvokerException
{
producerInfo.refresh(false);
- return producerInfo.getEndpointConfigurationInfo().getServiceDescriptionService();
+ return getEndpointConfigurationInfo().getServiceDescriptionService();
}
public WSRP_v1_Markup_PortType getMarkupService() throws PortletInvokerException
{
producerInfo.refresh(false);
- return producerInfo.getEndpointConfigurationInfo().getMarkupService();
+ return getEndpointConfigurationInfo().getMarkupService();
}
public WSRP_v1_PortletManagement_PortType getPortletManagementService() throws PortletInvokerException
{
producerInfo.refresh(false);
- return producerInfo.getEndpointConfigurationInfo().getPortletManagementService();
+ return getEndpointConfigurationInfo().getPortletManagementService();
}
public WSRP_v1_Registration_PortType getRegistrationService() throws PortletInvokerException
{
producerInfo.refresh(false);
- return producerInfo.getEndpointConfigurationInfo().getRegistrationService();
+ return getEndpointConfigurationInfo().getRegistrationService();
}
public void refreshProducerInfo() throws PortletInvokerException
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java 2007-04-17 22:03:45 UTC (rev 6994)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeploymentFactory.java 2007-04-18 00:15:31 UTC (rev 6995)
@@ -325,7 +325,7 @@
}
String message;
- if (consumer.getServiceFactory().isAvailable())
+ if (consumer.getProducerInfo().getEndpointConfigurationInfo().isAvailable())
{
message = "Added consumer for producer '" + consumer.getProducerId() + "' from xml configuration.";
deployment.getConsumers().add(consumer);
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r6994 - trunk/portlet-server/src/main/org/jboss/portal.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-17 18:03:45 -0400 (Tue, 17 Apr 2007)
New Revision: 6994
Removed:
trunk/portlet-server/src/main/org/jboss/portal/web/
Log:
remove empty dir
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r6993 - trunk/portlet/src/main/org/jboss/portal.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-17 18:03:26 -0400 (Tue, 17 Apr 2007)
New Revision: 6993
Removed:
trunk/portlet/src/main/org/jboss/portal/web/
Log:
remove empty dir
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r6992 - trunk/theme.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-17 18:02:22 -0400 (Tue, 17 Apr 2007)
New Revision: 6992
Modified:
trunk/theme/build.xml
Log:
commented obsolete theme tests
Modified: trunk/theme/build.xml
===================================================================
--- trunk/theme/build.xml 2007-04-17 21:41:55 UTC (rev 6991)
+++ trunk/theme/build.xml 2007-04-17 22:02:22 UTC (rev 6992)
@@ -254,17 +254,21 @@
<execute-tests>
<x-test>
<!-- theme tests -->
+<!--
<test todir="${test.reports}" name="org.jboss.portal.test.theme.TestLayoutServiceImpl"/>
<test todir="${test.reports}" name="org.jboss.portal.test.theme.TestThemeServiceImpl"/>
+-->
<!-- theme metadata tests -->
+<!--
<test todir="${test.reports}" name="org.jboss.portal.test.theme.metadata.TestPortalLayoutMetaData"/>
<test todir="${test.reports}" name="org.jboss.portal.test.theme.metadata.TestPortalThemeMetaData"/>
<test todir="${test.reports}" name="org.jboss.portal.test.theme.metadata.TestRenderSetMetaData"/>
+-->
<!-- render tests -->
<!--<test todir="${test.reports}" name="org.jboss.portal.test.theme.render.TestRenderContext"/>-->
- <test todir="${test.reports}" name="org.jboss.portal.test.theme.render.TestRenderedMarkup"/>
+ <!--<test todir="${test.reports}" name="org.jboss.portal.test.theme.render.TestRenderedMarkup"/>-->
</x-test>
<x-classpath>
<path refid="oswego.concurrent.classpath"/>
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r6991 - trunk/test/src/main/org/jboss/portal/test/framework/driver/http.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-17 17:41:55 -0400 (Tue, 17 Apr 2007)
New Revision: 6991
Modified:
trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java
Log:
fix test framework
Modified: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java 2007-04-17 21:17:25 UTC (rev 6990)
+++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java 2007-04-17 21:41:55 UTC (rev 6991)
@@ -86,6 +86,9 @@
/** The path where archive we want to deploy are. */
private String archivePath;
+ /** The test parametrization. */
+ private TestParametrization parametrization;
+
/**
* The test agent, normally only valid in the server side for now.
* It is transient so it is not marshalled when the context is popped on the client by
@@ -94,9 +97,6 @@
*/
transient TestAgent testAgent;
- /** The test parametrization. */
- private TestParametrization parametrization;
-
/**
* Copy constructor.
*/
@@ -106,6 +106,7 @@
this.requestCount = that.requestCount;
this.archivePath = that.archivePath;
this.response = that.response;
+ this.parametrization = that.parametrization;
this.testAgent = that.testAgent;
}
@@ -120,6 +121,7 @@
this.requestCount = that.requestCount;
this.archivePath = that.archivePath;
this.response = that.response;
+ this.parametrization = that.parametrization;
this.testAgent = that.testAgent;
}
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r6990 - in trunk: test/src/main/org/jboss/portal/test/framework/driver/http and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-17 17:17:25 -0400 (Tue, 17 Apr 2007)
New Revision: 6990
Modified:
trunk/portlet-server/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml
trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestSuite.java
trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java
trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverServer.java
Log:
fix test framework
Modified: trunk/portlet-server/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/portlet-server/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml 2007-04-17 19:27:20 UTC (rev 6989)
+++ trunk/portlet-server/src/resources/test/info/test-info-sar/META-INF/jboss-service.xml 2007-04-17 21:17:25 UTC (rev 6990)
@@ -23,22 +23,11 @@
<server>
- <!-- -->
<mbean
- code="org.jboss.portal.test.framework.driver.http.HttpTestDriverServer"
- name="portal.test:service=HttpTestDriverServer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <depends
- optional-attribute-name="Agent"
- proxy-type="attribute">portal.test:service=Agent</depends>
- </mbean>
- <mbean
code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
name="portal.test:service=Invoker,name=HttpTestDriverServer">
<depends optional-attribute-name="InvokerName">jboss:service=invoker,type=jrmp</depends>
- <depends optional-attribute-name="TargetName">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TargetName">portal:controller=Request</depends>
<attribute name="JndiName">HttpTestDriverServer</attribute>
<attribute name="ExportedInterfaces">org.jboss.portal.test.framework.driver.http.HttpTestDriver</attribute>
</mbean>
@@ -109,7 +98,9 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends
+ optional-attribute-name="Agent"
+ proxy-type="attribute">portal.test:service=Agent</depends>
</mbean>
<!-- The controller factory -->
Modified: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestSuite.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestSuite.java 2007-04-17 19:27:20 UTC (rev 6989)
+++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestSuite.java 2007-04-17 21:17:25 UTC (rev 6990)
@@ -48,7 +48,7 @@
String newTestId = item.getId(httpDriver.getInfo());
//
- HttpTestContext ctx2 = new HttpTestContext(newTestId, testContext.getRequestCount(), testContext.getArchivePath(), testContext.getParametrization());
+ HttpTestContext ctx2 = new HttpTestContext(newTestId, testContext);
//
httpDriver.pushContext(newTestId, ctx2);
@@ -65,11 +65,6 @@
String newTestId = item.getId(httpDriver.getInfo());
//
- HttpTestContext context = httpDriver.popContext(newTestId);
- context = new HttpTestContext(context);
- context.setTestAgent(null);
-
- //
- return context;
+ return httpDriver.popContext(newTestId);
}
}
Modified: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java 2007-04-17 19:27:20 UTC (rev 6989)
+++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestContext.java 2007-04-17 21:17:25 UTC (rev 6990)
@@ -35,6 +35,7 @@
/**
* The test context seen from the server side.
+ * @todo make a client side context and a server side context, basically (server side context == client side context + services)
*
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5498 $
@@ -85,8 +86,13 @@
/** The path where archive we want to deploy are. */
private String archivePath;
- /** The test agent, normally only valid in the server side for now. */
- private TestAgent testAgent;
+ /**
+ * The test agent, normally only valid in the server side for now.
+ * It is transient so it is not marshalled when the context is popped on the client by
+ * <code>HttpTestDriverServer.popContext()</code>
+ * It is package protected so it can be set by the <code>HttpTestDriverServer.pushContext(...)</code> method.
+ */
+ transient TestAgent testAgent;
/** The test parametrization. */
private TestParametrization parametrization;
@@ -100,14 +106,37 @@
this.requestCount = that.requestCount;
this.archivePath = that.archivePath;
this.response = that.response;
+ this.testAgent = that.testAgent;
}
- public HttpTestContext(String testName, int requestCount, String archivePath, TestParametrization parametrization)
+ /**
+ * Normally used on the server side.
+ */
+ public HttpTestContext(
+ String testName,
+ HttpTestContext that)
{
this.testName = testName;
+ this.requestCount = that.requestCount;
+ this.archivePath = that.archivePath;
+ this.response = that.response;
+ this.testAgent = that.testAgent;
+ }
+
+ /**
+ * Normally used on the client side.
+ */
+ public HttpTestContext(
+ String testName,
+ int requestCount,
+ String archivePath,
+ TestParametrization parametrization)
+ {
+ this.testName = testName;
this.requestCount = requestCount;
this.archivePath = archivePath;
this.parametrization = parametrization;
+ this.testAgent = null;
}
public TestParametrization getParametrization()
@@ -121,22 +150,6 @@
}
/**
- * Should not be exposed, but for now, well.
- */
- public TestAgent getTestAgent()
- {
- return testAgent;
- }
-
- /**
- * Should not be exposed, but for now, well.
- */
- public void setTestAgent(TestAgent testAgent)
- {
- this.testAgent = testAgent;
- }
-
- /**
* Return the test id.
*
* @return the test id
Modified: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverServer.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverServer.java 2007-04-17 19:27:20 UTC (rev 6989)
+++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverServer.java 2007-04-17 21:17:25 UTC (rev 6990)
@@ -47,7 +47,7 @@
public void pushContext(String testId, HttpTestContext testContext)
{
- testContext.setTestAgent(getAgent());
+ testContext.testAgent = getAgent();
//
suite.pushContext(testId, testContext);
@@ -55,12 +55,7 @@
public HttpTestContext popContext(String testId)
{
- HttpTestContext context = suite.popContext(testId);
-
- //
- context = new HttpTestContext(context);
- context.setTestAgent(null);
- return context;
+ return suite.popContext(testId);
}
public synchronized void addDriver(TestDriver driver)
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r6989 - in trunk: portlet/src/main/org/jboss/portal/test/framework/portlet and 8 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-17 15:27:20 -0400 (Tue, 17 Apr 2007)
New Revision: 6989
Added:
trunk/common/src/main/org/jboss/portal/common/test/driver/TestDriverContainer.java
trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestSuite.java
Removed:
trunk/common/src/main/org/jboss/portal/common/test/driver/TestDriverRegistry.java
Modified:
trunk/common/src/main/org/jboss/portal/common/test/driver/TestSuite.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java
trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java
trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java
trunk/server/src/main/org/jboss/portal/test/server/TestRequestController.java
trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml
trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml
trunk/server/src/resources/test/test-response-sar/META-INF/jboss-service.xml
trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml
trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestCase.java
trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriver.java
trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverServer.java
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java
Log:
fix portlet and server test framework
Copied: trunk/common/src/main/org/jboss/portal/common/test/driver/TestDriverContainer.java (from rev 6975, trunk/common/src/main/org/jboss/portal/common/test/driver/TestDriverRegistry.java)
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/test/driver/TestDriverContainer.java (rev 0)
+++ trunk/common/src/main/org/jboss/portal/common/test/driver/TestDriverContainer.java 2007-04-17 19:27:20 UTC (rev 6989)
@@ -0,0 +1,57 @@
+/******************************************************************************
+ * 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.portal.common.test.driver;
+
+/**
+ * Provides an interface for a test driver container.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public interface TestDriverContainer extends TestDriver
+{
+ /**
+ * Add a driver.
+ *
+ * @param driver
+ * @throws IllegalArgumentException if the driver is null or already registered
+ */
+ void addDriver(TestDriver driver) throws IllegalArgumentException;
+
+ /**
+ * Remove a driver.
+ *
+ * @param driver
+ * @throws IllegalArgumentException if the driver is null or does not exist
+ */
+ void removeDriver(TestDriver driver) throws IllegalArgumentException;
+
+ /**
+ * Return a driver that is able to understand the specified id.
+ *
+ * @param testId
+ * @return
+ * @throws IllegalArgumentException
+ */
+ TestDriver getDriver(String testId) throws IllegalArgumentException;
+}
Deleted: trunk/common/src/main/org/jboss/portal/common/test/driver/TestDriverRegistry.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/test/driver/TestDriverRegistry.java 2007-04-17 14:59:52 UTC (rev 6988)
+++ trunk/common/src/main/org/jboss/portal/common/test/driver/TestDriverRegistry.java 2007-04-17 19:27:20 UTC (rev 6989)
@@ -1,57 +0,0 @@
-/******************************************************************************
- * 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.portal.common.test.driver;
-
-/**
- * Provides an interface for a test driver registry.
- *
- * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
- * @version $Revision: 1.1 $
- */
-public interface TestDriverRegistry
-{
- /**
- * Register a driver.
- *
- * @param driver
- * @throws IllegalArgumentException if the driver is null or already registered
- */
- void register(TestDriver driver) throws IllegalArgumentException;
-
- /**
- * Unregister a driver.
- *
- * @param driver
- * @throws IllegalArgumentException if the driver is null or does not exist
- */
- void unregister(TestDriver driver) throws IllegalArgumentException;
-
- /**
- * Return a driver that is able to understand the specified id.
- *
- * @param itemId
- * @return
- * @throws IllegalArgumentException
- */
- TestDriver getDriver(String itemId) throws IllegalArgumentException;
-}
Modified: trunk/common/src/main/org/jboss/portal/common/test/driver/TestSuite.java
===================================================================
--- trunk/common/src/main/org/jboss/portal/common/test/driver/TestSuite.java 2007-04-17 14:59:52 UTC (rev 6988)
+++ trunk/common/src/main/org/jboss/portal/common/test/driver/TestSuite.java 2007-04-17 19:27:20 UTC (rev 6989)
@@ -29,10 +29,12 @@
import java.util.LinkedHashMap;
/**
+ * A test suite is a test driver container that expose itself as a test driver.
+ *
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
*/
-public class TestSuite implements TestDriver
+public class TestSuite implements TestDriverContainer
{
/** . */
@@ -47,9 +49,9 @@
info = new TestContainerInfo(id);
}
- public TestDriver getDriver(String itemId)
+ public TestDriver getDriver(String testId)
{
- TestItemInfo itemInfo = info.findItem(itemId);
+ TestItemInfo itemInfo = info.findItem(testId);
if (itemInfo == null)
{
return null;
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-04-17 14:59:52 UTC (rev 6988)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestDriver.java 2007-04-17 19:27:20 UTC (rev 6989)
@@ -121,9 +121,9 @@
return new InvokeGetResponse("/test/" + info.getName());
}
- public void pushContext(String testId, HttpTestContext ctx)
+ public void pushContext(String testId, HttpTestContext testContext)
{
- context = new PortletTestContext(ctx);
+ context = new PortletTestContext(testContext);
}
public HttpTestContext popContext(String testId)
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java 2007-04-17 14:59:52 UTC (rev 6988)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/PortletTestSuite.java 2007-04-17 19:27:20 UTC (rev 6989)
@@ -93,13 +93,13 @@
//
sce.getServletContext().setAttribute("SequenceRegistry", driver);
- TestDriverRegistryAccess.getInstance().getTestDriverRegistry().register(driver);
+ TestDriverRegistryAccess.getInstance().getTestDriverRegistry().addDriver(driver);
}
public void contextDestroyed(ServletContextEvent sce)
{
sce.getServletContext().removeAttribute("SequenceRegistry");
- TestDriverRegistryAccess.getInstance().getTestDriverRegistry().unregister(driver);
+ TestDriverRegistryAccess.getInstance().getTestDriverRegistry().removeDriver(driver);
}
/**
Modified: trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java 2007-04-17 14:59:52 UTC (rev 6988)
+++ trunk/portlet/src/main/org/jboss/portal/test/framework/portlet/TestDriverRegistryAccess.java 2007-04-17 19:27:20 UTC (rev 6989)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.framework.portlet;
-import org.jboss.portal.common.test.driver.TestDriverRegistry;
+import org.jboss.portal.common.test.driver.TestDriverContainer;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -32,19 +32,19 @@
{
/** . */
- private static TestDriverRegistry testDriverRegistry;
+ private static TestDriverContainer testDriverContainer;
/** . */
private static TestDriverRegistryAccess instance;
- public TestDriverRegistry getTestDriverRegistry()
+ public TestDriverContainer getTestDriverRegistry()
{
- return testDriverRegistry;
+ return testDriverContainer;
}
- public void setTestDriverRegistry(TestDriverRegistry testDriverRegistry)
+ public void setTestDriverRegistry(TestDriverContainer testDriverContainer)
{
- this.testDriverRegistry = testDriverRegistry;
+ this.testDriverContainer = testDriverContainer;
}
public void start() throws Exception
Modified: trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java
===================================================================
--- trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java 2007-04-17 14:59:52 UTC (rev 6988)
+++ trunk/portlet/src/main/org/jboss/portal/test/portlet/info/AbstractInfoTest.java 2007-04-17 19:27:20 UTC (rev 6989)
@@ -22,13 +22,12 @@
******************************************************************************/
package org.jboss.portal.test.portlet.info;
-import org.jboss.portal.test.framework.driver.http.HttpTestCase;
import org.jboss.portal.portlet.container.PortletApplicationRegistry;
import org.jboss.portal.common.test.driver.TestDriver;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.test.driver.DriverCommand;
import org.jboss.portal.common.test.driver.TestDriverException;
-import org.jboss.portal.common.test.driver.TestDriverRegistry;
+import org.jboss.portal.common.test.driver.TestDriverContainer;
import org.jboss.portal.common.test.driver.response.ErrorResponse;
import org.jboss.portal.common.test.driver.response.EndTestResponse;
import org.jboss.portal.common.test.driver.command.StartTestCommand;
@@ -52,7 +51,7 @@
protected PortletApplicationRegistry registry;
/** The controller. */
- protected TestDriverRegistry testDriverRegistry;
+ protected TestDriverContainer testDriverContainer;
public AbstractInfoTest(String testCaseId)
{
@@ -76,24 +75,24 @@
this.registry = registry;
}
- public TestDriverRegistry getTestDriverRegistry()
+ public TestDriverContainer getTestDriverRegistry()
{
- return testDriverRegistry;
+ return testDriverContainer;
}
- public void setTestDriverRegistry(TestDriverRegistry testDriverRegistry)
+ public void setTestDriverRegistry(TestDriverContainer testDriverContainer)
{
- this.testDriverRegistry = testDriverRegistry;
+ this.testDriverContainer = testDriverContainer;
}
public void create()
{
- testDriverRegistry.register(this);
+ testDriverContainer.addDriver(this);
}
public void destroy()
{
- testDriverRegistry.unregister(this);
+ testDriverContainer.removeDriver(this);
}
public TestItemInfo getInfo()
Modified: trunk/server/src/main/org/jboss/portal/test/server/TestRequestController.java
===================================================================
--- trunk/server/src/main/org/jboss/portal/test/server/TestRequestController.java 2007-04-17 14:59:52 UTC (rev 6988)
+++ trunk/server/src/main/org/jboss/portal/test/server/TestRequestController.java 2007-04-17 19:27:20 UTC (rev 6989)
@@ -28,7 +28,6 @@
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.test.driver.DriverCommand;
import org.jboss.portal.common.test.driver.TestDriverException;
-import org.jboss.portal.common.test.driver.TestDriverRegistry;
import org.jboss.portal.common.test.driver.command.StartTestCommand;
import org.jboss.portal.test.framework.driver.http.HttpTestDriverServer;
import org.jboss.portal.test.framework.server.driver.AbstractTest;
@@ -41,59 +40,17 @@
{
/** . */
- private TestDriverRegistry testDriverRegistry;
-
- /** . */
private String currentTestId;
- public TestDriverRegistry getTestDriverRegistry()
+ public TestRequestController()
{
- return testDriverRegistry;
}
- public void setTestDriverRegistry(TestDriverRegistry testDriverRegistry)
- {
- this.testDriverRegistry = testDriverRegistry;
- }
-
- protected void createService()
- {
- testDriverRegistry.register(this);
- }
-
- protected void destroyService()
- {
- testDriverRegistry.unregister(this);
- }
-
-
- public void create() throws Exception
- {
- super.create();
- }
-
-
- public void start() throws Exception
- {
- super.start();
- }
-
-
- public void stop()
- {
- super.stop();
- }
-
- public void destroy()
- {
- super.destroy();
- }
-
public DriverResponse invoke(String testId, DriverCommand cmd) throws TestDriverException
{
DriverResponse response = super.invoke(testId, cmd);
- //
+ // Save the current id for http invocations later, see handle method
if (cmd instanceof StartTestCommand)
{
currentTestId = testId;
@@ -105,6 +62,8 @@
public void handle(ServerInvocation invocation) throws ServerException
{
AbstractTest test = (AbstractTest)getDriver(currentTestId);
+
+ //
test.execute(invocation);
}
}
Modified: trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml 2007-04-17 14:59:52 UTC (rev 6988)
+++ trunk/server/src/resources/test/test-charset-sar/META-INF/jboss-service.xml 2007-04-17 19:27:20 UTC (rev 6989)
@@ -25,20 +25,10 @@
<!-- -->
<mbean
- code="org.jboss.portal.test.framework.driver.http.HttpTestDriverServer"
- name="portal.test:service=HttpTestDriverServer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <depends
- optional-attribute-name="Agent"
- proxy-type="attribute">portal.test:service=Agent</depends>
- </mbean>
- <mbean
code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
name="portal.test:service=Invoker,name=HttpTestDriverServer">
<depends optional-attribute-name="InvokerName">jboss:service=invoker,type=jrmp</depends>
- <depends optional-attribute-name="TargetName">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TargetName">portal:controller=Request</depends>
<attribute name="JndiName">HttpTestDriverServer</attribute>
<attribute name="ExportedInterfaces">org.jboss.portal.test.framework.driver.http.HttpTestDriver</attribute>
</mbean>
@@ -53,7 +43,6 @@
<attribute name="ConfigLocation">conf/config.xml</attribute>
</mbean>
-
<!-- Runtime context for running portlet container -->
<mbean
code="org.jboss.portal.web.jboss.JBossWebContext"
@@ -92,7 +81,9 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends
+ optional-attribute-name="Agent"
+ proxy-type="attribute">portal.test:service=Agent</depends>
</mbean>
<!-- The controller factory -->
Modified: trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml 2007-04-17 14:59:52 UTC (rev 6988)
+++ trunk/server/src/resources/test/test-parameters-sar/META-INF/jboss-service.xml 2007-04-17 19:27:20 UTC (rev 6989)
@@ -25,20 +25,10 @@
<!-- -->
<mbean
- code="org.jboss.portal.test.framework.driver.http.HttpTestDriverServer"
- name="portal.test:service=HttpTestDriverServer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <depends
- optional-attribute-name="Agent"
- proxy-type="attribute">portal.test:service=Agent</depends>
- </mbean>
- <mbean
code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
name="portal.test:service=Invoker,name=HttpTestDriverServer">
<depends optional-attribute-name="InvokerName">jboss:service=invoker,type=jrmp</depends>
- <depends optional-attribute-name="TargetName">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TargetName">portal:controller=Request</depends>
<attribute name="JndiName">HttpTestDriverServer</attribute>
<attribute name="ExportedInterfaces">org.jboss.portal.test.framework.driver.http.HttpTestDriver</attribute>
</mbean>
@@ -91,7 +81,9 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends
+ optional-attribute-name="Agent"
+ proxy-type="attribute">portal.test:service=Agent</depends>
</mbean>
<!-- The controller factory -->
Modified: trunk/server/src/resources/test/test-response-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/test/test-response-sar/META-INF/jboss-service.xml 2007-04-17 14:59:52 UTC (rev 6988)
+++ trunk/server/src/resources/test/test-response-sar/META-INF/jboss-service.xml 2007-04-17 19:27:20 UTC (rev 6989)
@@ -25,20 +25,10 @@
<!-- -->
<mbean
- code="org.jboss.portal.test.framework.driver.http.HttpTestDriverServer"
- name="portal.test:service=HttpTestDriverServer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <depends
- optional-attribute-name="Agent"
- proxy-type="attribute">portal.test:service=Agent</depends>
- </mbean>
- <mbean
code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
name="portal.test:service=Invoker,name=HttpTestDriverServer">
<depends optional-attribute-name="InvokerName">jboss:service=invoker,type=jrmp</depends>
- <depends optional-attribute-name="TargetName">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TargetName">portal:controller=Request</depends>
<attribute name="JndiName">HttpTestDriverServer</attribute>
<attribute name="ExportedInterfaces">org.jboss.portal.test.framework.driver.http.HttpTestDriver</attribute>
</mbean>
@@ -91,7 +81,9 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends
+ optional-attribute-name="Agent"
+ proxy-type="attribute">portal.test:service=Agent</depends>
</mbean>
<!-- The controller factory -->
Modified: trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml 2007-04-17 14:59:52 UTC (rev 6988)
+++ trunk/server/src/resources/test/test-servlet-sar/META-INF/jboss-service.xml 2007-04-17 19:27:20 UTC (rev 6989)
@@ -25,20 +25,10 @@
<!-- -->
<mbean
- code="org.jboss.portal.test.framework.driver.http.HttpTestDriverServer"
- name="portal.test:service=HttpTestDriverServer"
- xmbean-dd=""
- xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
- <xmbean/>
- <depends
- optional-attribute-name="Agent"
- proxy-type="attribute">portal.test:service=Agent</depends>
- </mbean>
- <mbean
code="org.jboss.invocation.jrmp.server.JRMPProxyFactory"
name="portal.test:service=Invoker,name=HttpTestDriverServer">
<depends optional-attribute-name="InvokerName">jboss:service=invoker,type=jrmp</depends>
- <depends optional-attribute-name="TargetName">portal.test:service=HttpTestDriverServer</depends>
+ <depends optional-attribute-name="TargetName">portal:controller=Request</depends>
<attribute name="JndiName">HttpTestDriverServer</attribute>
<attribute name="ExportedInterfaces">org.jboss.portal.test.framework.driver.http.HttpTestDriver</attribute>
</mbean>
@@ -91,7 +81,9 @@
xmbean-dd=""
xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
<xmbean/>
- <depends optional-attribute-name="TestDriverRegistry" proxy-type="attribute">portal.test:service=HttpTestDriverServer</depends>
+ <depends
+ optional-attribute-name="Agent"
+ proxy-type="attribute">portal.test:service=Agent</depends>
</mbean>
<!-- The controller factory -->
Added: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestSuite.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestSuite.java (rev 0)
+++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HTTPTestSuite.java 2007-04-17 19:27:20 UTC (rev 6989)
@@ -0,0 +1,75 @@
+/******************************************************************************
+ * 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.portal.test.framework.driver.http;
+
+import org.jboss.portal.common.test.driver.TestSuite;
+import org.jboss.portal.common.test.info.TestItemInfo;
+
+/**
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class HTTPTestSuite extends TestSuite implements HttpTestDriver
+{
+
+ public HTTPTestSuite(String id)
+ {
+ super(id);
+ }
+
+ public void pushContext(String testId, HttpTestContext testContext)
+ {
+ TestItemInfo item = info.findItem(testId);
+
+ // Get a driver
+ HttpTestDriver httpDriver = (HttpTestDriver)getDriver(testId);
+
+ // Get new relative id
+ String newTestId = item.getId(httpDriver.getInfo());
+
+ //
+ HttpTestContext ctx2 = new HttpTestContext(newTestId, testContext.getRequestCount(), testContext.getArchivePath(), testContext.getParametrization());
+
+ //
+ httpDriver.pushContext(newTestId, ctx2);
+ }
+
+ public HttpTestContext popContext(String testId)
+ {
+ TestItemInfo item = info.findItem(testId);
+
+ // Get a driver
+ HttpTestDriver httpDriver = (HttpTestDriver)getDriver(testId);
+
+ // Get new relative id
+ String newTestId = item.getId(httpDriver.getInfo());
+
+ //
+ HttpTestContext context = httpDriver.popContext(newTestId);
+ context = new HttpTestContext(context);
+ context.setTestAgent(null);
+
+ //
+ return context;
+ }
+}
Modified: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestCase.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestCase.java 2007-04-17 14:59:52 UTC (rev 6988)
+++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestCase.java 2007-04-17 19:27:20 UTC (rev 6989)
@@ -22,7 +22,7 @@
******************************************************************************/
package org.jboss.portal.test.framework.driver.http;
-import org.jboss.portal.common.test.driver.TestDriverRegistry;
+import org.jboss.portal.common.test.driver.TestDriverContainer;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.test.driver.DriverCommand;
import org.jboss.portal.common.test.driver.TestDriverException;
@@ -54,7 +54,7 @@
protected HttpTestContext context;
/** The driver registry, in the future we should remove that and use some kind of external wiring mechanism. */
- protected TestDriverRegistry testDriverRegistry;
+ protected TestDriverContainer testDriverContainer;
public HttpTestCase(String testCaseId, String path)
{
@@ -78,14 +78,14 @@
return testInfo;
}
- public TestDriverRegistry getTestDriverRegistry()
+ public TestDriverContainer getTestDriverRegistry()
{
- return testDriverRegistry;
+ return testDriverContainer;
}
- public void setTestDriverRegistry(TestDriverRegistry testDriverRegistry)
+ public void setTestDriverRegistry(TestDriverContainer testDriverContainer)
{
- this.testDriverRegistry = testDriverRegistry;
+ this.testDriverContainer = testDriverContainer;
}
public String getTestCaseId()
@@ -100,17 +100,17 @@
public void create()
{
- testDriverRegistry.register(this);
+ testDriverContainer.addDriver(this);
}
public void destroy()
{
- testDriverRegistry.unregister(this);
+ testDriverContainer.removeDriver(this);
}
- public void pushContext(String testId, HttpTestContext ctx)
+ public void pushContext(String testId, HttpTestContext testContext)
{
- this.context = ctx;
+ this.context = testContext;
}
public HttpTestContext popContext(String testId)
Modified: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriver.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriver.java 2007-04-17 14:59:52 UTC (rev 6988)
+++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriver.java 2007-04-17 19:27:20 UTC (rev 6989)
@@ -37,7 +37,7 @@
/**
* A client side push of an http test context for a specific test.
*/
- void pushContext(String testId, HttpTestContext ctx);
+ void pushContext(String testId, HttpTestContext testContext);
/**
* A client pop of an http test context for a specific test.
Modified: trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverServer.java
===================================================================
--- trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverServer.java 2007-04-17 14:59:52 UTC (rev 6988)
+++ trunk/test/src/main/org/jboss/portal/test/framework/driver/http/HttpTestDriverServer.java 2007-04-17 19:27:20 UTC (rev 6989)
@@ -26,8 +26,7 @@
import org.jboss.portal.common.test.driver.TestDriverException;
import org.jboss.portal.common.test.driver.TestDriver;
import org.jboss.portal.common.test.driver.DriverCommand;
-import org.jboss.portal.common.test.driver.TestDriverRegistry;
-import org.jboss.portal.common.test.driver.TestSuite;
+import org.jboss.portal.common.test.driver.TestDriverContainer;
import org.jboss.portal.common.test.info.TestItemInfo;
import org.jboss.portal.test.framework.driver.AbstractTestDriverServer;
@@ -35,56 +34,48 @@
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 5636 $
*/
-public class HttpTestDriverServer extends AbstractTestDriverServer implements HttpTestDriver, TestDriverRegistry
+public class HttpTestDriverServer extends AbstractTestDriverServer implements HttpTestDriver, TestDriverContainer
{
/** . */
- protected final TestSuite suite;
+ protected final HTTPTestSuite suite;
public HttpTestDriverServer()
{
- suite = new TestSuite("Main");
+ suite = new HTTPTestSuite("Main");
}
- public void pushContext(String testId, HttpTestContext ctx)
+ public void pushContext(String testId, HttpTestContext testContext)
{
- TestDriver driver = getDriver(testId);
- if (driver instanceof HttpTestDriver)
- {
- HttpTestDriver httpDriver = (HttpTestDriver)driver;
- TestItemInfo item = driver.getInfo();
- String newId = item.getId(httpDriver.getInfo());
- HttpTestContext ctx2 = new HttpTestContext(newId, ctx.getRequestCount(), ctx.getArchivePath(), ctx.getParametrization());
- ctx2.setTestAgent(getAgent());
- httpDriver.pushContext(newId, ctx2);
- }
+ testContext.setTestAgent(getAgent());
+
+ //
+ suite.pushContext(testId, testContext);
}
public HttpTestContext popContext(String testId)
{
- TestDriver driver = getDriver(testId);
- HttpTestDriver httpDriver = (HttpTestDriver)driver;
- TestItemInfo item = httpDriver.getInfo();
- String newId = item.getId(httpDriver.getInfo());
- HttpTestContext context = httpDriver.popContext(newId);
+ HttpTestContext context = suite.popContext(testId);
+
+ //
context = new HttpTestContext(context);
context.setTestAgent(null);
return context;
}
- public synchronized void register(TestDriver driver)
+ public synchronized void addDriver(TestDriver driver)
{
suite.addDriver(driver);
}
- public synchronized void unregister(TestDriver driver)
+ public synchronized void removeDriver(TestDriver driver)
{
suite.removeDriver(driver);
}
- public TestDriver getDriver(String itemId)
+ public TestDriver getDriver(String testId)
{
- return suite.getDriver(itemId);
+ return suite.getDriver(testId);
}
public DriverResponse invoke(String testId, DriverCommand cmd) throws TestDriverException
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java 2007-04-17 14:59:52 UTC (rev 6988)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/WSRPBaseTest.java 2007-04-17 19:27:20 UTC (rev 6989)
@@ -33,7 +33,7 @@
import org.jboss.portal.common.test.driver.DriverCommand;
import org.jboss.portal.common.test.driver.DriverResponse;
import org.jboss.portal.common.test.driver.TestDriverException;
-import org.jboss.portal.common.test.driver.TestDriverRegistry;
+import org.jboss.portal.common.test.driver.TestDriverContainer;
import org.jboss.portal.common.test.info.TestItemInfo;
import org.jboss.portal.common.test.junit.POJOJUnitTest;
import org.jboss.portal.jems.as.system.AbstractJBossService;
@@ -57,7 +57,7 @@
private POJOJUnitTest test;
/** . */
- private TestDriverRegistry testDriverRegistry;
+ private TestDriverContainer testDriverContainer;
/** . */
private HttpTestContext context;
@@ -77,25 +77,25 @@
}
- public TestDriverRegistry getTestDriverRegistry()
+ public TestDriverContainer getTestDriverRegistry()
{
- return testDriverRegistry;
+ return testDriverContainer;
}
- public void setTestDriverRegistry(TestDriverRegistry testDriverRegistry)
+ public void setTestDriverRegistry(TestDriverContainer testDriverContainer)
{
- this.testDriverRegistry = testDriverRegistry;
+ this.testDriverContainer = testDriverContainer;
}
protected void startService() throws Exception
{
test = new POJOJUnitTest(this);
- testDriverRegistry.register(this);
+ testDriverContainer.addDriver(this);
}
protected void stopService() throws Exception
{
- testDriverRegistry.unregister(this);
+ testDriverContainer.removeDriver(this);
}
/** Make it accessible from outter packages. */
@@ -128,9 +128,9 @@
return test.invoke(testId, command);
}
- public void pushContext(String testId, HttpTestContext ctx)
+ public void pushContext(String testId, HttpTestContext testContext)
{
- this.context = ctx;
+ this.context = testContext;
}
public HttpTestContext popContext(String testId)
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r6988 - trunk/core-admin/src/bin/portal-admin-war.
by portal-commits＠lists.jboss.org
Author: thomas.heute(a)jboss.com
Date: 2007-04-17 10:59:52 -0400 (Tue, 17 Apr 2007)
New Revision: 6988
Modified:
trunk/core-admin/src/bin/portal-admin-war/style.css
Log:
Make the whole box change color.
Modified: trunk/core-admin/src/bin/portal-admin-war/style.css
===================================================================
--- trunk/core-admin/src/bin/portal-admin-war/style.css 2007-04-17 13:44:08 UTC (rev 6987)
+++ trunk/core-admin/src/bin/portal-admin-war/style.css 2007-04-17 14:59:52 UTC (rev 6988)
@@ -62,7 +62,7 @@
background-color: #eef;
}
-.admin-ui ul.topnav li a:hover {
+.admin-ui ul.topnav li:hover {
background-color: #ccf;
}
17 years, 2 months
- 1
- 0
JBoss Portal SVN: r6987 - in trunk: core/src/resources/portal-core-war/WEB-INF/classes and 4 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-04-17 09:44:08 -0400 (Tue, 17 Apr 2007)
New Revision: 6987
Added:
trunk/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
trunk/core-samples/src/resources/portal-samples-war/WEB-INF/classes/NewsResource_it.properties
trunk/core-search/src/resources/portal-search-war/WEB-INF/classes/Resource_it.properties
trunk/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties
trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties
trunk/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties
Log:
JBPORTAL-1336 : Italian patch for jboss portal
Added: trunk/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties
===================================================================
--- trunk/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties (rev 0)
+++ trunk/core/src/resources/portal-core-sar/conf/bundles/Resource_it.properties 2007-04-17 13:44:08 UTC (rev 6987)
@@ -0,0 +1,28 @@
+################################################################################
+# 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. #
+################################################################################
+
+# Navigation Portlet
+PAGENAME_default=Home
+PAGENAME_Admin=Amministrazione
+PAGENAME_Test=Test
+PAGENAME_News=Novita'
Added: trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties (rev 0)
+++ trunk/core/src/resources/portal-core-war/WEB-INF/classes/Resource_it.properties 2007-04-17 13:44:08 UTC (rev 6987)
@@ -0,0 +1,318 @@
+################################################################################
+# 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. #
+################################################################################
+
+_ASREGISTERED=Non hai ancora un account? Puoi <a href\="index.html?module=user&op=getlogin">crearne uno</a>.
+_BLOCKNICKNAME=Username
+_BLOCKPASSWORD=Password
+
+
+
+MessageOrder=Ordine del messaggio
+Ascending=Ascendente
+Descending=Discendente
+
+AIM=Indirizzo AIM
+ICQ=Numero ICQ
+YIM=Numero YIM
+MSNM=MSN Messenger
+
+YourAIM=Il tuo indirizzo AIM
+YourICQ=Il tuo numero ICQ
+YourYIM=Il tuo numero YIM
+YourMSNM=Il tuo MSN Messenger
+
+MyEmail=La mia e-mail
+MyHomePage=La mia homepage
+
+Question=Domanda segreta
+Answer=Risposta segreta
+Location=Localita'
+Occupation=Occupazione
+Interests=Interessi
+ExtraInfo=Informazioni extra
+YourLocation=La tua localita'
+YourOccupation=La tua occupazione
+YourInterests=Tuoi interessi
+Signature=Firma
+
+LoginSite=Login.
+Register=Registra.
+
+UserExist=Lo Username esiste gia
+ToChangeInfo=per cambiare le tue info
+EmailVerify=Mandato il link di attivazione! Leggi la tua e-mail e clicca sul link per l'attivazione.
+AccountActivated=Account creato con successo!
+UnableActivate=Impossibile validare il nuovo utente.
+LoggingYou=Login in atto, attenti un po'\!
+YouAreLoggedOut=Sei uscito\!
+PassDifferent=Le passwords sono differenti. Devono essere identiche.
+YourPassMustBe=Mi spiace, la tua password deve essere di almeno
+CharLong=caratteri
+UserNotExist=L'utente non esiste\!
+UserRegLogin=Registrazione utente/login
+SelectOption=Seleziona un'opzione dal menu in basso\:
+RetrievePass=Ricevi la password persa.
+RegNewUser=Nuova registrazione utente
+PasswordAgain=Conferma la tua password
+Email=E-mail
+Options=Opzioni
+AllowEmailView=Permetti agli altri utenti di vedere la mia e-mail
+AsRegUser=Come utente registrato puoi\:
+AsReg6=Seleziona differenti temi
+AsReg5=Personalizza i commenti
+AsReg4=Seleziona quanti nuovi oggetti da mostrare sulla homepage
+AsReg3=Prendi un box personale sulla homepage
+AsReg2=Manda news con il tuo username
+AsReg1=Rispondi con il tuo username
+RegisterNow=Registrati ora\! E' gratis\!
+WeDontGive=Non vogliamo darti altre informazioni personali.
+WelcomeTo=Benvenuto su
+Registration=area di registrazione.
+
+Over13_1=Io sono
+Over13_2=o al di sopra o con il consenso dei genitori
+MustBe_1=Devi essere
+MustBe_2=o al di sopra, o con il consenso dei genitori per registrarmi qui.
+Consent_1=(Cliccando sul link qui sopra per verificare quanto detto<br>
+Consent_2=o al di sopra, o con il consenso dei genitori per registrarmi qui.)
+Under13_1=Sono al di sotto
+Under13_2=e non ho il consenso dei genitori.
+
+Sorry=Mi spiace.
+Click=Per favore clicca
+Here=qui
+Return=per ritornare alla pagina principale.
+UserName=Username
+GoBack=Indietro
+Finish=Termina
+PersonalInfo=Informazione personale
+RealName=nome reale
+Optional=(opzionale)
+CanKnowAbout=(massimo 255 caratteri. Scrivi cosa vorresti far sapere agli altri)
+Language=Lingua
+255CharMax=(massimo 255 caratteri. Scrivi la tua firma con la codifica HTML)
+YourAvatar=La tua identita'
+YourHomePage=Il tuo sito web
+TimeZoneOffset=Fuso orario
+EmailNotPublic=(Questa e-mail non sara' pubblica ma e' richiesta. Sara' usata per inviarti la password nel caso la perdessi)
+EmailPublic=(Questa e-mail sara' pubblica. Scrivi quello che vuoi. A prova di spam)
+RealEmail=e-mail principale
+FakeEmail=e-mail secondaria
+NewUser=Nuovo utente
+SaveChanges=Salva le modifiche
+SaveChange=Salva la modifica
+TypeNewPassword=(digita una nuova password due volte per cambiarla)
+Search=Cerca
+All=Tutto
+UsersFoundFor=utenti trovati per
+Pages=pagine
+UsersShown=utenti mostrati
+Delete=Cancella
+Edit=Modifica
+Ok=Ok
+Cancel=Cancella
+AreYouSureToDeleteUser=Sei sicuro di voler cancellare l' utente?
+UserDeleted=Utente cancellato con successo
+ReturnToMemberList=Ritorna alla lista dei membri
+Avatar=Identita'
+AdminFunctions=Funzioni di amministrazione
+URL=URL
+UpdateUser=Aggiorna l'utente
+UserID=User ID
+ForChanges=(Solo per le modifiche)
+MemberList=Lista dei membri
+SearchTip=Consiglio: scegli una lettera, visualizza tutto o cerca un utente se conosci lo username
+
+ThemeText1=Quest'opzione cambiera' il look all'intero sito.
+ThemeText2=Le modifiche saranno valide solo per te.
+ThemeText3=Ogni utente puo' vedere il sito con un tema differente.
+SelectTheme=Seleziona un tema
+ThemeSelection=Selezione del tema
+
+CannotLogin=Non posso procedere con la login
+
+LoginInvalidName=il nome utente non e' valido
+LoginNoSuchUser=il nome utente non esiste
+LoginBadPassword=la tua password non e' corretta
+LoginUnexpectedError=errore inaspettato
+LoginUserDisabled=il tuo account e' stato bloccato. Per favore contatta l'amministratore.
+
+Enable=Attiva
+Disable=Disattiva
+StatusChanged=Lo stato dell'utente e' stato modificato con successo
+
+NotAuth=Non sei autorizzato ad eseguire quest\'operazione
+
+
+REMEMBERME=Ricordami
+LOGIN=Login
+USERNAME=Username
+PASSWORD=Password
+USERLOGIN=Login utente
+
+OPTIONAL=Opzionale
+REQUIRED=Obbligatorio
+
+255MAX=(Firma di massimo 255 caratteri)
+
+NAMENOTAVAILABLE=N/A
+
+MODIFIED_PROFILE=Il tuo profilo e' stato modificato, il portale lavorera' con il vecchio profilo finche' non ti ricolleghi.
+
+# Registration
+REGISTER_NOT_LOGGED_IN=You are currently not logged in.
+REGISTER_REGISTER=Non hai ancora un account? Puoi
+REGISTER_REGISTER_LINK=crearlo
+REGISTER_REGISTER_ADMIN_LINK=Crea un account
+REGISTER_TY=Grazie per la registrazione.
+REGISTER_BASICINFO=Informazioni base sull'utente
+REGISTER_IM=Identita' del messaggio istantaneo
+REGISTER_ADDITIONAL=Informazioni sull'utente opzionali e aggiuntive
+REGISTER_NEWUSER=Registrazione nuovo utente
+REGISTER_PASSWORDAGAIN=Conferma la tua password
+REGISTER_REALEMAIL=e-mail principale
+REGISTER_EMAILNOTPUBLIC=(Questa e-mail non sara' pubblica ma e' richiesta. Sara' usata per inviarti la password nel caso la perdessi)
+REGISTER_FAKEEMAIL=e-mail secondaria
+REGISTER_EMAILPUBLIC=(Questa e-mail sara' pubblica. Scrivi quello che vuoi. A prova di spam)
+REGISTER_FAKEEMAIL_EXPLAIN=Se questo campo non e' vuoto, l'e-mail principale sara' usata solo per mandare notifiche
+REGISTER_QUESTION=Domanda segreta
+REGISTER_ANSWER=Risposta segreta
+REGISTER_ASREGUSER=Come utente registrato puoi:
+REGISTER_ASREG6=Seleziona differenti temi
+REGISTER_ASREG5=Personalizza i commenti
+REGISTER_ASREG4=Seleziona quanti nuovi oggetti mostrare sulla homepage
+REGISTER_ASREG3=Ottieni un box personale sulla homepage
+REGISTER_ASREG2=Manda news con il tuo username
+REGISTER_ASREG1=Rispondi ai commenti con il tuo username
+REGISTER_REGISTERNOW=Registrati ora! E' gratis!
+REGISTER_WEDONTGIVE=Non vogliamo dare agli altri le tue informazioni personali.
+REGISTER_ALREADYHAVEACCOUNT=Hai gia' un account:
+REGISTER_SIGNIN=Registrati
+REGISTER_GIVENNAME=Nome
+REGISTER_FAMILYNAME=Cognome
+REGISTER_PERSONALINFO=Informazione personale
+REGISTER_VIEWREALEMAIL=Permetti agli altri utenti di vedere il mio indirizzo di posta
+REGISTER_HOMEPAGE=Indirizzo del tuo sito personale
+REGISTER_TIMEZONEOFFSET=Fuso orario
+REGISTER_THEME=Tema
+REGISTER_DEFAULT_THEME=Sito di default
+REGISTER_ICQ=Id ICQ
+REGISTER_AIM=Id AIM
+REGISTER_YIM=Id Yahoo
+REGISTER_MSNM=Id MSN messenger
+REGISTER_SKYPE=Id Skype
+REGISTER_LOCATION=Localita'
+REGISTER_LANGUAGE=Lingua preferita
+REGISTER_OCCUPATION=Occupazione
+REGISTER_INTERESTS=Interessi
+REGISTER_SIGNATURE=Firma
+REGISTER_EXTRAINFO=Informazioni extra
+REGISTER_CANKNOWABOUT=(massimo 255 caratteri. Scrivi quello che vuoi che gli altri sappiano di te)
+REGISTER_SAVECHANGES=Salva le modifiche
+REGISTER_CONFIRMATIONEMAIL=E-mail di conferma
+
+REGISTER_SHOWMENU=Torna al menu utenti
+
+REGISTER_ERROR_INVALIDUSERNAME=Il nome utente non e' valido
+REGISTER_ERROR_EXISTINGUSERNAME=Questo nome utente e' gia' stato preso
+REGISTER_ERROR_INVALIDPASSWORD1=La password non e' valida
+REGISTER_ERROR_INVALIDPASSWORD2=La password non e' valida
+REGISTER_ERROR_PASSWORDMISMATCH=La password non corrisponde
+REGISTER_ERROR_INVALIDREALEMAIL=L'indirizzo di posta non e' valido
+
+REGISTER_CONFIRM=L'utente e' stato creato con successo.
+REGISTER_ADMIN_SEARCH=Visualizza/edita gli utenti
+
+
+MENU_LOGOUT=Logout
+MENU_EDITPROFILE=Modifica il tuo profilo
+MENU_LISTUSERS=Lista di tutti gli utenti
+
+LIST_FILTERS=Applica i filtri alla lista
+LIST_USERSPERPAGE=Utenti per pagina
+LIST_USERNAMECONTAINS=Contiene lo username
+LIST_FULLNAME=Nome per intero
+LIST_USERNAME=Nome utente
+LIST_FIRSTNAME=Nome
+LIST_LASTNAME=Cognome
+LIST_ROLES=Ruoli
+LIST_ACTIONS=Azioni
+LIST_ACTIONSSHOWPROFILE=Profilo
+LIST_ACTIONADDROLESTOUSER=Ruoli
+LIST_ACTIONEDITROLES=Modifica i ruoli
+LIST_ACTIONDELETEUSER=Cancella l'utente
+LIST_SEARCHRESULTS=Cerca i risultati per
+LIST_MATCHING=Utenti trovati
+FILTER=Filtro
+
+NEXTPAGE=Prossima pagina
+PREVIOUSPAGE=Pagina precedente
+
+ASSIGNROLES=Assegna i ruoli
+ROLESAVAILABLE=Ruoli attivi
+EDITROLESFORUSER=Modifica i ruoli per l'utente
+
+
+ROLE_THEREARE=Ci sono
+ROLE_THEREIS=C'e'
+ROLE_ROLESDEFINED=ruoli definiti
+ROLE_ROLEDEFINED=ruolo definito
+
+ROLE_NAME=Nome del nuovo ruolo
+ROLE_DISPLAYNAME=Nome visualizzabile del ruolo
+ROLE_NEWDISPLAYNAME=Nuovo nome visualizzato del ruolo
+ROLE_SELECTONETOMODIFY= Seleziona il ruolo da modificare
+ROLE_SELECTONETODELETE= Seleziona il ruolo da cancellare
+ROLE_CREATE=Crea un nuovo ruolo utente
+ROLE_UPDATE=Aggiorna il ruolo utente
+ROLE_EDIT=Modifica il ruolo utente
+ROLE_DELETE=Cancella il ruolo selezionato
+ROLE_DELETED=Il ruolo e'stato cancellato
+ROLE_EDIT_MEMBERS=Modifica il ruolo dei membri
+ROLE_MAINLIST=Torna alla modifica del ruolo
+ROLE_EDIT_USER=Modifica i ruoli degli utenti
+
+ROLE_ERROR_DISPLAYNAMEALREADYEXISTS=Esiste gia' un ruolo con quel nome visualizzabile
+ROLE_ERROR_NAMEALREADYEXISTS=Esiste gia' un ruolo con quel nome
+ROLE_ERROR_NAMEEMPTY=Il nome del ruolo non puo' essere vuoto
+ROLE_ERROR_DISPLAYNAMEEMPTY=Il nome visualizzabile del ruolo non puo' essere vuoto
+ROLE_ERROR_DELETE_FAILED=Non si puo' cancellare il ruolo
+
+MENU_CREATEROLE=Crea un nuovo ruolo
+MENU_EDITROLE=Modifica il ruolo esistente
+MENU_EDITROLEMEMBERS=Modifica i membri del ruolo
+
+ROLE_TEXT_1=Usa questa portlet per creare,editare,cancellare e aggiungere i ruoli agli utenti.
+ROLE_TEXT_2=Questi ruoli sono usati nella portlet di gestione per configurare i permessi.
+
+PERMISSION_PICKPORTLET=Amministrazione dei permessi per le portlet
+PERMISSION_PERMISSIONS=Permessi di modifica
+PERMISSION_TOP=Seleziona un componente da modificare
+PERMISSION_FINERGRAIN=Seleziona un sotto componente per definire i suoi permessi
+PERMISSION_MODIFYROLES=Aggiungi/Rimuovi ruoli
+PERMISSION_MODIFYINGROLES=Modifica i ruoli per
+PERMISSION_DOMAIN=Dominio
+PERMISSION_DOMAIN_MOD=Modifica Dominio
+PERMISSION_DEFINEDROLES=Ruoli definiti
+PERMISSION_IMPLIEDROLES=Ruoli impliciti
+
Added: trunk/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- trunk/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties (rev 0)
+++ trunk/core-cms/src/resources/portal-cms-war/WEB-INF/classes/Resource_it.properties 2007-04-17 13:44:08 UTC (rev 6987)
@@ -0,0 +1,93 @@
+################################################################################
+# 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. #
+################################################################################
+
+## CMS ADMIN PORTLET
+TITLE_HEAD=Amministrazione CMS
+TITLE_BROWSE=Navigatore delle Directory
+TITLE_FILEBROWSE=Navigatore dei File
+TITLE_DELETECONFIRM=Conferma di Cancellazione
+TITLE_CREATECOLLCONFIRM=Conferma di creazione della Directory
+TITLE_COPYCONFIRM=Conferma di Copia della Risorsa
+TITLE_MOVECONFIRM=Conferma di Spostamento della Risorsa
+TITLE_VIEWFILE=Visualizzazione delle Proprieta' dei File
+TITLE_EDIT=Modifica File
+TITLE_CREATE=Creazione File
+TITLE_UPLOAD=Caricamento File
+TITLE_SECURECONFIRM=Nodo sicuro
+
+CMS_SEARCH=Ricerca
+CMS_SEARCHNORESULT=Nessun risultato per questa ricerca
+CMS_MENU=Menu delle Azioni
+CMS_ACTION=Azione
+CMS_NAME=Nome
+CMS_TYPE=Tipo
+CMS_CREATED=Creato
+CMS_MODIFIED=Modificato
+CMS_DESCRIPTION=Descrizione
+CMS_VIEW=Visualizza
+CMS_COPY=Copia
+CMS_MOVE=Sposta
+CMS_DELETE=Cancella
+CMS_FOLDER=Cartella
+CMS_FILE=File
+CMS_CREATE=Crea
+CMS_EDIT=Edita
+CMS_UPLOAD=Caricamento
+CMS_MODIFY=Modifica
+CMS_CREATEFOLDER= Crea Cartella
+CMS_CREATEFILE=Crea File
+CMS_UPLOADARCHIVE=Carica Archivio
+CMS_BACKTOBROWSER=Torna al Navigatore delle Directory
+CMS_TRANSFER=Importa/Esporta
+CMS_EXPORTARCHIVE=Esporta Cartella
+CMS_SECURE=Sicuro
+
+CMS_CREATEFILEINDIR=Crea File nella Directory
+CMS_FILENAME=Nome del File
+CMS_TITLE=Titolo
+CMS_LANGUAGE=Lingua
+
+CMS_DELETEPATH=Conferma la Cancellazione di
+CMS_DELETEWARN1=ATTENZIONE! Non ti e\' permesso tornare alla vecchia configurazione\!
+CMS_DELETEWARN2=Sei sicuro di voler cancellare questa risorsa\?
+
+CMS_DESTINATION=Destinazione
+CMS_SOURCE=Sorgente
+
+CMS_EDITING=Editaggio del File
+CMS_LIVE=Rendi \"Dal Vivo\"
+CMS_VERSION=Versione
+
+CMS_LIVEVERSION=Versione dal vivo
+CMS_SIZE=Grandezza
+
+CMS_CONTENT_DIR=Contenuto della Directory
+CMS_CONTENT_DIR_USE=Usa l\'albero delle directory per navigare nella struttura a cartelle del portale.
+CMS_MAIN_USE=Usa la portlet di Amministrazione CMS per gestire il contenuto del tuo portale.
+
+CMS_CREATED_BY=Creato da
+CMS_APPROVE=Approva
+CMS_DENY=Nega
+CMS_APPROVAL=Oggetti in sospeso
+CMS_PATH=Localita\'
+
Added: trunk/core-samples/src/resources/portal-samples-war/WEB-INF/classes/NewsResource_it.properties
===================================================================
--- trunk/core-samples/src/resources/portal-samples-war/WEB-INF/classes/NewsResource_it.properties (rev 0)
+++ trunk/core-samples/src/resources/portal-samples-war/WEB-INF/classes/NewsResource_it.properties 2007-04-17 13:44:08 UTC (rev 6987)
@@ -0,0 +1,25 @@
+################################################################################
+# 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. #
+################################################################################
+
+javax.portlet.preference.description.RssXml=URL per RSS
+javax.portlet.preference.description.expires=Scadenza
Added: trunk/core-search/src/resources/portal-search-war/WEB-INF/classes/Resource_it.properties
===================================================================
--- trunk/core-search/src/resources/portal-search-war/WEB-INF/classes/Resource_it.properties (rev 0)
+++ trunk/core-search/src/resources/portal-search-war/WEB-INF/classes/Resource_it.properties 2007-04-17 13:44:08 UTC (rev 6987)
@@ -0,0 +1,25 @@
+################################################################################
+# 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. #
+################################################################################
+
+SEARCH_SEARCH=Search
+
Added: trunk/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties
===================================================================
--- trunk/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties (rev 0)
+++ trunk/migration/src/resources/portal-migration-war/WEB-INF/classes/messages_it.properties 2007-04-17 13:44:08 UTC (rev 6987)
@@ -0,0 +1,64 @@
+# Welcome Page
+pagetitle=Upgrade per JBoss Portal
+welcome1=Quest\'applicazione migrera\' il tuo JBoss Portal esistente
+welcome2=usato su un nuovo Database per JBoss Portal
+req=Esigenze:
+req1=Devi deployare quest\'applicazione nello stesso modo di JBoss Portal
+req2=Quest\'applicazione richiede l\'accesso a due datasource per JBoss Portal (Uno per versione).
+req3=DA NON FARE: deployare JBoss Portal
+req3a=finche\' il processo di migrazione non e\' completo!
+ds=Nome JNDI del DataSource Descriptor
+
+# Step 1
+step1=Step 1
+checkdbtitle=Verifica di connettivita\' del Database
+dbfail=Fallita la connessione al Database!
+dbpass=Connessione al Database... avvenuta con successo.
+
+# Step 2
+step2=Step 2
+
+# Step 3
+createtitle=Step 3: Creazione delle tabelle
+tblcreatepass=Tabelle create con successo.
+tblcreatefail=Creazione della tabella fallita!
+createtablebegin=Premi il bottone Continua in basso, ti creera\' la nuova struttura del Database.
+migrationcmsbegin=Premendo il bottone Continua in basso, iniziera\' il processo di migrazione verso il tuo nuovo DB per i dati CMS.
+
+# Step 4: Migrate CMS
+migratecmstitle=Step 4: Migrazione dei dati del CMS
+migratecmspass=Dati CMS migrati con successo.
+migratecmsfail=Migrazione del CMS fallita!
+migrationuserbegin=Premendo il bottone Continua in basso, iniziera\' il processo di migrazione verso il tuo nuovo DB per i dati Utenti/Ruoli.
+
+# Step 5: Migrate User/Role Data
+migrateusertitle=Step 5: Migrazione dei dati Utenti/Ruoli
+migrateuserpass= Dati Utenti/Ruoli migrati con successo.
+migrateuserfail=Migrazione dei dati Utenti/Ruoli fallita!
+migrationobjectbegin=Premendo il bottone Continua in basso, iniziera\' il processo di migrazione verso il tuo nuovo DB per gli oggetti del portaleortal.
+
+# Step 6: Migrate Portal Object Data
+migrateobjecttitle=Step 6: Migrazione degli oggetti del portale
+migrateobjectpass= Oggetti del portale migrati con successo.
+migrateobjectfail=Migrazione degli oggetti del portale fallita!
+migrationinstancebegin=Premendo il bottone Continua in basso, iniziera\' il processo di migrazione verso il tuo nuovo DB per i dati sulle istanze delle portlets.
+
+# Step 7: Migrate Portlet Instances Data
+migrateinstancetitle=Step 7: Migrazione dei dati delle istanze delle portlets
+migrateinstancepass= Dati delle istanze delle portlets migrati con successo.
+migrateinstancefail=Migrazione dei dati delle istanze delle portlets fallita!
+migrationsecuritybegin=Premendo il bottone Continua in basso, iniziera\' il processo di migrazione verso il tuo nuovo DB per i dati sulla Sicurezza.
+
+# Step 8: Migrate Portlet Instances Data
+migratesecuritytitle=Step 8: Migrazione dei dati sulla Sicurezza
+migratesecuritypass= Dati sulla Sicurezza migrati con successo.
+migratesecurityfail=Migrazione dei dati sulla Sicurezza fallita!
+
+# END: End of migration
+migratesuccesstitle=Fine della migrazione
+migratesuccesspass=Migrazione avvenuta con successo!
+
+# Nav
+continue=Continua
+back=Indietro
+retry=Riprova
17 years, 2 months
- 1
- 0