JBoss Portal SVN: r11289 - in modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state: mock and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-07-03 18:34:30 -0400 (Thu, 03 Jul 2008)
New Revision: 11289
Added:
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/mock/MockModelTestCase.java
Modified:
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/AbstractStructuralStateContextTestCase.java
Log:
- mock model unit test for structural state context conformance
- unit test properties update during a refresh operation
Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/AbstractStructuralStateContextTestCase.java
===================================================================
--- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/AbstractStructuralStateContextTestCase.java 2008-07-03 21:59:22 UTC (rev 11288)
+++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/AbstractStructuralStateContextTestCase.java 2008-07-03 22:34:30 UTC (rev 11289)
@@ -33,6 +33,7 @@
import org.jboss.portal.presentation.state.structural.StructuralState;
import org.jboss.portal.presentation.state.structural.StructuralStateContext;
import org.jboss.portal.presentation.test.state.mock.MockException;
+import org.jboss.portal.common.util.MapBuilder;
import java.util.Collection;
import java.util.Collections;
@@ -341,7 +342,7 @@
}
- public void testRefresh() throws MockException
+ public void testChildrenRefresh() throws MockException
{
MockObject mockRoot = getRoot();
String rootId = getId(mockRoot);
@@ -392,6 +393,37 @@
}
}
+ public void testPropertiesRefresh() throws MockException
+ {
+ MockObject mockRoot = getRoot();
+ String rootId = getId(mockRoot);
+
+ //
+ StructuralObject rootV0 = getStructuralStateContext().load(rootId);
+
+ //
+ setProperty(mockRoot, "foo", "foo_1");
+ setProperty(mockRoot, "bar", "bar_1");
+ setProperty(mockRoot, "daa", "daa_1");
+ StructuralObject.Refresh refresh1 = getStructuralStateContext().refresh(rootV0);
+ Map<String, Serializable> update1 = MapBuilder.hashMap("foo", (Serializable)"foo_1").put("bar", "bar_1").put("daa", "daa_1").get();
+ assertEquals(update1, refresh1.getPropertiesUpdate());
+
+ //
+ StructuralObject rootV1 = getStructuralStateContext().load(rootId);
+
+ //
+ setProperty(mockRoot, "foo", null);
+ setProperty(mockRoot, "bar", "bar_2");
+ setProperty(mockRoot, "juu", "juu_1");
+ StructuralObject.Refresh refresh2_1 = getStructuralStateContext().refresh(rootV1);
+ Map<String, Serializable> update2_1 = MapBuilder.hashMap("foo", (Serializable)null).put("bar", "bar_2").put("juu", "juu_1").get();
+ assertEquals(update2_1, refresh2_1.getPropertiesUpdate());
+ StructuralObject.Refresh refresh2_2 = getStructuralStateContext().refresh(rootV0);
+ Map<String, Serializable> update2_2 = MapBuilder.hashMap("bar", (Serializable)"bar_2").put("daa", "daa_1").put("juu", "juu_1").get();
+ assertEquals(update2_2, refresh2_2.getPropertiesUpdate());
+ }
+
protected final void assertValidity(StructuralObject object, Class<? extends StateException> expected) throws MockException
{
try
Added: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/mock/MockModelTestCase.java
===================================================================
--- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/mock/MockModelTestCase.java (rev 0)
+++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/mock/MockModelTestCase.java 2008-07-03 22:34:30 UTC (rev 11289)
@@ -0,0 +1,125 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2008, 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.presentation.test.state.mock;
+
+import org.jboss.portal.presentation.test.state.AbstractStructuralStateContextTestCase;
+import org.jboss.portal.presentation.test.state.mock.impl.MockModelImpl;
+import org.jboss.portal.presentation.state.structural.StructuralStateContext;
+import org.jboss.portal.presentation.model.ui.UIObject;
+
+import java.util.Set;
+import java.util.List;
+import java.io.Serializable;
+
+/**
+ * Test that the mock model structural state context implementation.
+ *
+ * @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
+ * @version $Revision: 630 $
+ */
+public class MockModelTestCase extends AbstractStructuralStateContextTestCase<MockObject>
+{
+
+ /** . */
+ private MockModel mockModel;
+
+ public MockModelTestCase()
+ {
+ }
+
+ public MockModelTestCase(String testName)
+ {
+ super(testName);
+ }
+
+ protected void setUp() throws Exception
+ {
+ mockModel = new MockModelImpl();
+ }
+
+ protected StructuralStateContext getStructuralStateContext()
+ {
+ return mockModel.getStructuralStateContext();
+ }
+
+ protected MockObject getRoot()
+ {
+ return mockModel.getRoot();
+ }
+
+ protected Set<String> getPropertyNames(MockObject mockObject)
+ {
+ return mockObject.getPropertyNames();
+ }
+
+ protected MockObject getParent(MockObject mockObject)
+ {
+ return mockObject.getParent();
+ }
+
+ protected List<? extends MockObject> getChildren(MockObject mockObject)
+ {
+ return mockObject.getChildren();
+ }
+
+ protected String getName(MockObject mockObject)
+ {
+ return mockObject.getName();
+ }
+
+ protected boolean isValid(MockObject mockObject)
+ {
+ return mockObject.isValid();
+ }
+
+ protected Class<? extends UIObject> getType(MockObject mockObject)
+ {
+ return mockObject.getType();
+ }
+
+ protected String getId(MockObject mockObject)
+ {
+ return mockObject.getId();
+ }
+
+ protected MockObject addChild(MockObject mockObject, String name, Class<? extends UIObject> modelType)
+ {
+ return mockObject.addChild(name, modelType);
+ }
+
+ protected void destroy(MockObject mockObject)
+ {
+ mockModel.destroy(mockObject);
+ }
+
+ protected void setProperty(MockObject mockObject, String propertyName, String propertyValue)
+ {
+ mockObject.setPropertyValue(propertyName, propertyValue);
+ }
+
+ protected Serializable getProperty(MockObject mockObject, String name)
+ {
+ return mockObject.getPropertyValue(name);
+ }
+}
+
16 years
JBoss Portal SVN: r11288 - in modules/presentation/trunk: presentation/src/main/java/org/jboss/portal/presentation/impl/model and 3 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2008-07-03 17:59:22 -0400 (Thu, 03 Jul 2008)
New Revision: 11288
Modified:
modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/CreateDiffPhase.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ObjectVisit.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralObjectImpl.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralStateContextImpl.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralObject.java
modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/mock/impl/MockModelImpl.java
modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/mock/impl/StructuralObjectImpl.java
Log:
minor refactor of switch logic
Modified: modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java
===================================================================
--- modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java 2008-07-03 21:52:24 UTC (rev 11287)
+++ modules/presentation/trunk/ajax/src/main/java/org/jboss/portal/presentation/ajax/server/model/AjaxViewPortContext.java 2008-07-03 21:59:22 UTC (rev 11288)
@@ -118,8 +118,8 @@
public void updateObject(String objectId)
{
- updates
-
+// updates
+//
throw new NotYetImplemented();
}
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/CreateDiffPhase.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/CreateDiffPhase.java 2008-07-03 21:52:24 UTC (rev 11287)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/CreateDiffPhase.java 2008-07-03 21:59:22 UTC (rev 11288)
@@ -105,16 +105,20 @@
//
try
{
- switch (traversalType)
+ if (traversalType == ObjectTraversalType.SKIP)
{
- case SKIP:
- return new ObjectVisit(object, false);
- case SINGLE:
- return new ObjectVisit(object, true);
- case RECURSIVE:
- StructuralObject.Refresh refresh = structuralStateContext.refresh(object.getStructuralObject());
- ChildrenVisit childrenVisit = new ChildrenVisit();
+ return new ObjectVisit(object, false);
+ }
+ else
+ {
+ StructuralObject.Refresh refresh = structuralStateContext.refresh(object.getStructuralObject());
+ //
+ ChildrenVisit childrenVisit = null;
+ if (traversalType == ObjectTraversalType.RECURSIVE)
+ {
+ childrenVisit = new ChildrenVisit();
+
//
for (StructuralObject addedStructuralChild : refresh.getAddedChildren())
{
@@ -138,11 +142,10 @@
//
childrenVisit.removedObjects.addAll(refresh.getRemovedChildren());
+ }
- //
- return new ObjectVisit(object, childrenVisit);
- default:
- throw new AssertionError();
+ //
+ return new ObjectVisit(object, childrenVisit);
}
}
finally
@@ -161,30 +164,28 @@
//
try
{
- ObjectVisit visit;
- switch (traversalType)
+ if (traversalType == ObjectTraversalType.SKIP)
{
- case SKIP:
- visit = new ObjectVisit(object, false);
- break;
- case SINGLE:
- visit = new ObjectVisit(object, true);
- break;
- case RECURSIVE:
- ChildrenVisit childrenVisit = new ChildrenVisit();
+ return new ObjectVisit(object, false);
+ }
+ else
+ {
+ ChildrenVisit childrenVisit = null;
+
+ //
+ if (traversalType == ObjectTraversalType.RECURSIVE)
+ {
+ childrenVisit = new ChildrenVisit();
for (StructuralObject structuralChild : structuralStateContext.loadChildren(structuralObject))
{
ObjectVisit childVisit = load(structuralChild);
childrenVisit.addedObjects.add(childVisit);
}
- visit = new ObjectVisit(object, childrenVisit);
- break;
- default:
- throw new AssertionError();
+ }
+
+ //
+ return new ObjectVisit(object, childrenVisit);
}
-
- //
- return visit;
}
finally
{
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ObjectVisit.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ObjectVisit.java 2008-07-03 21:52:24 UTC (rev 11287)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/model/ObjectVisit.java 2008-07-03 21:59:22 UTC (rev 11288)
@@ -31,6 +31,29 @@
public class ObjectVisit
{
+
+ /*
+ public static class Skip extends ObjectVisit
+ {
+
+ }
+
+ public static class Load extends ObjectVisit
+ {
+
+ }
+
+ public static class Update extends ObjectVisit
+ {
+
+ }
+
+ public static class Evict extends ObjectVisit
+ {
+
+ }
+*/
+
/** . */
private final UIObjectImpl object;
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralObjectImpl.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralObjectImpl.java 2008-07-03 21:52:24 UTC (rev 11287)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralObjectImpl.java 2008-07-03 21:59:22 UTC (rev 11288)
@@ -117,5 +117,6 @@
return that.childrenIds.equals(this.childrenIds);
}
return false;
+// throw new UnsupportedOperationException();
}
}
\ No newline at end of file
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralStateContextImpl.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralStateContextImpl.java 2008-07-03 21:52:24 UTC (rev 11287)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/impl/state/structural/adapter/StructuralStateContextImpl.java 2008-07-03 21:59:22 UTC (rev 11288)
@@ -35,6 +35,7 @@
import java.util.Set;
import java.util.HashSet;
import java.util.Map;
+import java.io.Serializable;
/**
* @author <a href="mailto:julien@jboss-portal.org">Julien Viet</a>
@@ -259,6 +260,7 @@
return new StructuralObject.Refresh(
parentNode != null ? takeSnapshot(parentNode) : null,
nodeSnapshot,
+ new HashMap<String, Serializable>(),
addedStructuralChildren,
removedChildrenIds,
staleStructuralChildren,
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralObject.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralObject.java 2008-07-03 21:52:24 UTC (rev 11287)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralObject.java 2008-07-03 21:59:22 UTC (rev 11288)
@@ -24,6 +24,7 @@
import java.util.Map;
import java.util.Set;
+import java.io.Serializable;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -51,6 +52,9 @@
private final StructuralObject object;
/** . */
+ private final Map<String, Serializable> propertiesUpdate;
+
+ /** . */
private final Set<StructuralObject> addedChildren;
/** . */
@@ -65,11 +69,20 @@
public Refresh(
StructuralObject parent,
StructuralObject object,
+ Map<String, Serializable> propertiesUpdate,
Set<StructuralObject> addedChildren,
Set<String> removedChildren,
Map<String, StructuralObject> staleChildren,
Set<String> validChildren)
{
+ if (object == null)
+ {
+ throw new IllegalArgumentException();
+ }
+ if (propertiesUpdate == null)
+ {
+ throw new IllegalArgumentException();
+ }
if (addedChildren == null)
{
throw new IllegalArgumentException();
@@ -86,7 +99,10 @@
{
throw new IllegalArgumentException();
}
+
+ //
this.parent = parent;
+ this.propertiesUpdate = propertiesUpdate;
this.object = object;
this.addedChildren = addedChildren;
this.validChildren = validChildren;
@@ -99,6 +115,11 @@
return parent;
}
+ public Map<String, Serializable> getPropertiesUpdate()
+ {
+ return propertiesUpdate;
+ }
+
public StructuralObject getObject()
{
return object;
Modified: modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java
===================================================================
--- modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java 2008-07-03 21:52:24 UTC (rev 11287)
+++ modules/presentation/trunk/presentation/src/main/java/org/jboss/portal/presentation/state/structural/StructuralState.java 2008-07-03 21:59:22 UTC (rev 11288)
@@ -35,8 +35,17 @@
*/
public interface StructuralState
{
-
+ /**
+ * Returns the object type.
+ *
+ * @return the type
+ */
Class<? extends UIObject> getType();
+ /**
+ * Returns an immutable map containing the object properties.
+ *
+ * @return the properties
+ */
Map<String, Serializable> getProperties();
}
\ No newline at end of file
Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/mock/impl/MockModelImpl.java
===================================================================
--- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/mock/impl/MockModelImpl.java 2008-07-03 21:52:24 UTC (rev 11287)
+++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/mock/impl/MockModelImpl.java 2008-07-03 21:59:22 UTC (rev 11288)
@@ -40,6 +40,8 @@
import java.util.List;
import java.util.Map;
import java.util.Set;
+import java.util.Collections;
+import java.io.Serializable;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -146,6 +148,40 @@
}
//
+ Map<String, Serializable> currentProperties = current.getState().getProperties();
+ Map<String, Serializable> previousProperties = previous.getState().getProperties();
+ Map<String, Serializable> propertiesUpdate = Collections.emptyMap();
+
+ // Find all removed properties
+ for (String key : previousProperties.keySet())
+ {
+ if (!currentProperties.containsKey(key))
+ {
+ if (propertiesUpdate.isEmpty())
+ {
+ propertiesUpdate = new HashMap<String, Serializable>();
+ }
+ propertiesUpdate.put(key, null);
+ }
+ }
+
+ // Now put updated or new properties
+ for (Map.Entry<String, Serializable> entry : currentProperties.entrySet())
+ {
+ String currentKey = entry.getKey();
+ Serializable currentValue = entry.getValue();
+ Serializable previousValue = previousProperties.get(currentKey);
+ if (previousValue == null || !previousValue.equals(currentValue))
+ {
+ if (propertiesUpdate.isEmpty())
+ {
+ propertiesUpdate = new HashMap<String, Serializable>();
+ }
+ propertiesUpdate.put(currentKey, currentValue);
+ }
+ }
+
+ //
Map<String, StructuralObjectHandle> previousChildren = new HashMap<String, StructuralObjectHandle>();
for (StructuralObjectHandle childHandle : previous.childrenHandles)
{
@@ -210,7 +246,14 @@
}
//
- return new StructuralObject.Refresh(parent, current, addedChildren, removedChildren, staleChildrenHandleMap, validChildren);
+ return new StructuralObject.Refresh(
+ parent,
+ current,
+ propertiesUpdate,
+ addedChildren,
+ removedChildren,
+ staleChildrenHandleMap,
+ validChildren);
}
public Collection<StructuralObject> loadChildren(StructuralObject parent)
Modified: modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/mock/impl/StructuralObjectImpl.java
===================================================================
--- modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/mock/impl/StructuralObjectImpl.java 2008-07-03 21:52:24 UTC (rev 11287)
+++ modules/presentation/trunk/presentation/src/test/java/org/jboss/portal/presentation/test/state/mock/impl/StructuralObjectImpl.java 2008-07-03 21:59:22 UTC (rev 11288)
@@ -82,5 +82,6 @@
return handle.equals(that.handle);
}
return false;
+// throw new UnsupportedOperationException();
}
}
16 years
JBoss Portal SVN: r11287 - modules/web/trunk/build.
by portal-commits＠lists.jboss.org
Author: mwringe
Date: 2008-07-03 17:52:24 -0400 (Thu, 03 Jul 2008)
New Revision: 11287
Modified:
modules/web/trunk/build/pom.xml
Log:
Update cargo to support JBoss AS 5.0.0.CR1
Modified: modules/web/trunk/build/pom.xml
===================================================================
--- modules/web/trunk/build/pom.xml 2008-07-03 06:17:14 UTC (rev 11286)
+++ modules/web/trunk/build/pom.xml 2008-07-03 21:52:24 UTC (rev 11287)
@@ -39,7 +39,7 @@
<version.apache.commons-logging>1.1.1</version.apache.commons-logging>
<version.apache.commons-httpclient>3.0.1</version.apache.commons-httpclient>
<version.jboss.microcontainer>2.0.0.Beta13</version.jboss.microcontainer>
- <version.cargo>1.0-alpha-4</version.cargo>
+ <version.cargo>1.0-alpha-5</version.cargo>
<version.junit>3.8.1</version.junit>
<version.ant>1.7.0</version.ant>
</properties>
16 years
JBoss Portal SVN: r11286 - in docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules: extras and 1 other directory.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-07-03 02:17:14 -0400 (Thu, 03 Jul 2008)
New Revision: 11286
Added:
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/extras/
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/extras/runconf_javaops.xmlt
Modified:
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml
Log:
- adding an extras directory (for xmlt files)
- runconf_javaops.xmlt file: I could not get the example working in
maven unless it was included as a separate file
Added: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/extras/runconf_javaops.xmlt
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/extras/runconf_javaops.xmlt (rev 0)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/extras/runconf_javaops.xmlt 2008-07-03 06:17:14 UTC (rev 11286)
@@ -0,0 +1 @@
+JAVA_OPTS=-Dhttp.proxyHost=<proxy-hostname> -Dhttp.proxyPort=<proxy-port>
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml 2008-07-03 02:18:16 UTC (rev 11285)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/installation.xml 2008-07-03 06:17:14 UTC (rev 11286)
@@ -319,10 +319,8 @@
repository, so you must be connected to the Internet, and if you are behind a proxy server, you need to define your proxy server address and proxy server port number. To define a proxy server, add the following line to the <filename>$JBOSS_HOME/bin/run.conf</filename> file:
</para>
<para>
-<screen>
-JAVA_OPTS=-Dhttp.proxyHost=<<replaceable>proxy-hostname</replaceable>>
--Dhttp.proxyPort=<<replaceable>proxy-port</replaceable>>
-</screen>
+<screen><xi:include href="modules/extras/runconf_javaops.xmlt" parse="text" xmlns:xi="http://www.w3.org/2001/XInclude"></xi:include></screen>
+<!--JAVA_OPTS=-Dhttp.proxyHost=<<replaceable>proxy-hostname </replaceable>>-Dhttp.proxyPort=<<replaceable>proxy-port</replaceable>> -->
</para>
<para>
Replace <replaceable>proxy-hostname</replaceable> with the proxy server's hostname, and <replaceable>proxy-port</replaceable> with the correct proxy server port number.
16 years
JBoss Portal SVN: r11285 - docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-07-02 22:18:16 -0400 (Wed, 02 Jul 2008)
New Revision: 11285
Modified:
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/supported.xml
Log:
- minor revision to system requirements
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/supported.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/supported.xml 2008-07-03 02:17:51 UTC (rev 11284)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/supported.xml 2008-07-03 02:18:16 UTC (rev 11285)
@@ -12,7 +12,7 @@
</chapterinfo>
<title>System Requirements</title>
<para>
- The following chapter details hardware and software versions that are compatible with JBoss Portal. The hardware and software listed has been tested, or reported as working by users. Before reporting a problem, make sure you are using compatible hardware and software.
+ The following chapter details hardware and software versions that are compatible with JBoss Portal. The hardware and software listed has either been tested, or reported as working by users. Before reporting a problem, make sure you are using compatible hardware and software.
</para>
<para>
If you successfully installed JBoss Portal on versions not listed here, please let us know so it can be added to this section.
16 years
JBoss Portal SVN: r11284 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-07-02 22:17:51 -0400 (Wed, 02 Jul 2008)
New Revision: 11284
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml
Log:
- minor revision to system requirements
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml 2008-07-03 01:36:50 UTC (rev 11283)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml 2008-07-03 02:17:51 UTC (rev 11284)
@@ -13,7 +13,7 @@
</chapterinfo>
<title>System Requirements</title>
<para>
- The following chapter details hardware and software versions that are compatible with JBoss Portal. The hardware and software listed has been tested, or reported as working by users. Before reporting a problem, make sure you are using compatible hardware and software.
+ The following chapter details hardware and software versions that are compatible with JBoss Portal. The hardware and software listed has either been tested, or reported as working by users. Before reporting a problem, make sure you are using compatible hardware and software.
</para>
<para>
If you successfully installed JBoss Portal on versions not listed here, please let us know so it can be added to this section.
16 years
JBoss Portal SVN: r11283 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-07-02 21:36:50 -0400 (Wed, 02 Jul 2008)
New Revision: 11283
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml
Log:
spelling mistake "chatper"
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml 2008-07-03 00:40:29 UTC (rev 11282)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml 2008-07-03 01:36:50 UTC (rev 11283)
@@ -13,7 +13,7 @@
</chapterinfo>
<title>System Requirements</title>
<para>
- The following chatper details hardware and software versions that are compatible with JBoss Portal. The hardware and software listed has been tested, or reported as working by users. Before reporting a problem, make sure you are using compatible hardware and software.
+ The following chapter details hardware and software versions that are compatible with JBoss Portal. The hardware and software listed has been tested, or reported as working by users. Before reporting a problem, make sure you are using compatible hardware and software.
</para>
<para>
If you successfully installed JBoss Portal on versions not listed here, please let us know so it can be added to this section.
16 years
JBoss Portal SVN: r11282 - docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-07-02 20:40:29 -0400 (Wed, 02 Jul 2008)
New Revision: 11282
Modified:
docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/supported.xml
Log:
Chapter 1. System Requirements
- content revision, opening said it was a section,
when it is a chapter
Modified: docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/supported.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/supported.xml 2008-07-03 00:40:03 UTC (rev 11281)
+++ docs/branches/JBoss_Portal_Branch_2_7/referenceGuide/en/modules/supported.xml 2008-07-03 00:40:29 UTC (rev 11282)
@@ -12,7 +12,7 @@
</chapterinfo>
<title>System Requirements</title>
<para>
- The following section details hardware and software versions that are compatible with JBoss Portal. The hardware and software listed has been tested, or reported as working by users. Before reporting a problem, make sure you are using compatible hardware and software.
+ The following chapter details hardware and software versions that are compatible with JBoss Portal. The hardware and software listed has been tested, or reported as working by users. Before reporting a problem, make sure you are using compatible hardware and software.
</para>
<para>
If you successfully installed JBoss Portal on versions not listed here, please let us know so it can be added to this section.
16 years
JBoss Portal SVN: r11281 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-07-02 20:40:03 -0400 (Wed, 02 Jul 2008)
New Revision: 11281
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml
Log:
Chapter 1. System Requirements
- content revision (opening said it was a section, when
it is a chapter)
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml 2008-07-03 00:12:58 UTC (rev 11280)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/supported.xml 2008-07-03 00:40:03 UTC (rev 11281)
@@ -13,7 +13,7 @@
</chapterinfo>
<title>System Requirements</title>
<para>
- The following section details hardware and software versions that are compatible with JBoss Portal. The hardware and software listed has been tested, or reported as working by users. Before reporting a problem, make sure you are using compatible hardware and software.
+ The following chatper details hardware and software versions that are compatible with JBoss Portal. The hardware and software listed has been tested, or reported as working by users. Before reporting a problem, make sure you are using compatible hardware and software.
</para>
<para>
If you successfully installed JBoss Portal on versions not listed here, please let us know so it can be added to this section.
16 years
JBoss Portal SVN: r11280 - docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules.
by portal-commits＠lists.jboss.org
Author: mmcallis
Date: 2008-07-02 20:12:58 -0400 (Wed, 02 Jul 2008)
New Revision: 11280
Modified:
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/target.xml
docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
Log:
few changes from 2.7 being merged back to 2.6
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/target.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/target.xml 2008-07-03 00:12:36 UTC (rev 11279)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/target.xml 2008-07-03 00:12:58 UTC (rev 11280)
@@ -1,7 +1,7 @@
<preface id="target" revision="1">
<title>Target Audience</title>
<para>
- This guide is aimed towards Portlet developers, Portal administrators, and those wishing to
+ This guide is aimed towards portlet developers, portal administrators, and those wishing to
implement and extend the JBoss Portal framework. For end-user documentation, please refer to the JBoss Portal User Manual from the <ulink url="http://labs.jboss.com/portal/jbossportal/docs/index.html">JBoss Portal Documentation Library</ulink>
.</para>
</preface>
\ No newline at end of file
Modified: docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml
===================================================================
--- docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-07-03 00:12:36 UTC (rev 11279)
+++ docs/branches/JBoss_Portal_Branch_2_6/referenceGuide/en/modules/tutorials.xml 2008-07-03 00:12:58 UTC (rev 11280)
@@ -19,7 +19,7 @@
<title>Portlet Primer</title>
<sect1 id="portlet_primer">
<title>JSR-168 Overview</title>
- <para>The JSR-168 Portlet Specification aims at defining portlets that can be used by any JSR-168 portlet container, also known as a portal. There are different portals with commercial and non-commercial licenses. This chapter gives a brief overview of the <ulink url="http://www.jcp.org/en/jsr/detail?id=168">JSR-168 Portlet Specification</ulink>. Portlet developers are strongly encouraged to read the <ulink url="http://www.jcp.org/en/jsr/detail?id=168">JSR-168 Portlet Specification</ulink>.
+ <para>The <ulink url="http://www.jcp.org/en/jsr/detail?id=168">JSR-168 Portlet Specification</ulink> aims at defining portlets that can be used by any JSR-168 portlet container, also known as a portal. There are different portals with commercial and non-commercial licenses. This chapter gives a brief overview of the JSR-168 Portlet Specification. Portlet developers are strongly encouraged to read the <ulink url="http://www.jcp.org/en/jsr/detail?id=168">JSR-168 Portlet Specification</ulink>.
</para>
<para>
JBoss Portal is fully JSR-168 compliant, which means any JSR-168 portlet behaves as it should inside the portal.
16 years