August 2010 - gatein-commits - Jboss List Archives

gatein SVN: r3982 - epp/portal/branches/EPP_5_0_Branch.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-08-31 09:58:32 -0400 (Tue, 31 Aug 2010) New Revision: 3982 Modified: epp/portal/branches/EPP_5_0_Branch/pom.xml Log: JBEPP-393: Malformed security token root:john:appid:cont:url:0 error when adding gadgets Upgrade of Shindig Modified: epp/portal/branches/EPP_5_0_Branch/pom.xml =================================================================== --- epp/portal/branches/EPP_5_0_Branch/pom.xml 2010-08-31 13:45:35 UTC (rev 3981) +++ epp/portal/branches/EPP_5_0_Branch/pom.xml 2010-08-31 13:58:32 UTC (rev 3982) @@ -48,7 +48,7 @@ <org.exoplatform.ws.version>2.1.1-GA</org.exoplatform.ws.version> <org.exoplatform.jcr.version>1.12.1-GA</org.exoplatform.jcr.version> <org.jibx.version>1.2.1</org.jibx.version> - <org.shindig.version>1.0-r790473-Patch02</org.shindig.version> + <org.shindig.version>1.0-r790473-Patch03</org.shindig.version> <nl.captcha.simplecaptcha.version>1.1.1-GA-Patch01</nl.captcha.simplecaptcha.version> <org.gatein.common.version>2.0.2-GA</org.gatein.common.version> <org.gatein.wci.version>2.0.1-GA</org.gatein.wci.version>

13 years, 10 months

1
0
0 / 0

gatein SVN: r3981 - in components/wsrp/trunk/wsrp-producer-war: src/test/assembly and 10 other directories.

by do-not-reply＠jboss.org

Author: mvanco(a)redhat.com Date: 2010-08-31 09:45:35 -0400 (Tue, 31 Aug 2010) New Revision: 3981 Added: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-events-portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-eventswithobject-portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-portletmodes-portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/EventConsumerPortlet.java components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/EventGeneratorPortlet.java components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/EventObjectConsumerPortlet.java components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/EventObjectGeneratorPortlet.java components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/PortletModesPortlet.java components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/utils/ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/utils/TestObject.java components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-events-portlet-war/ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-events-portlet-war/WEB-INF/ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-events-portlet-war/WEB-INF/portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-events-portlet-war/WEB-INF/web.xml components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-events-portlet-war/view_consumer.jsp components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-events-portlet-war/view_generator.jsp components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-eventswithobject-portlet-war/ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-eventswithobject-portlet-war/WEB-INF/ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-eventswithobject-portlet-war/WEB-INF/portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-eventswithobject-portlet-war/WEB-INF/web.xml components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-eventswithobject-portlet-war/view_consumer.jsp components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-eventswithobject-portlet-war/view_generator.jsp components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/WEB-INF/ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/WEB-INF/portlet.xml components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/WEB-INF/web.xml components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/edit.jsp components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/help.jsp components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/test_mode.jsp components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/view.jsp Modified: components/wsrp/trunk/wsrp-producer-war/ components/wsrp/trunk/wsrp-producer-war/pom.xml components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java Log: WSRP2 sample test portlets + 2 unit tests at wsrp-producer-war (MarkupTestCase) - tests verify eventing between 2 portlets, one test is using sample event (with String value), another one is using TestObject - test testGetMarkupWithEventsAndObjects reproduces error: javax.xml.ws.soap.SOAPFaultException: Couldn't marshall payload TestObject with expected type {##default}##default - simple portlets contain these features: events, events with object, portlet modes - added assembly descriptors to generate separate war archives Property changes on: components/wsrp/trunk/wsrp-producer-war ___________________________________________________________________ Name: svn:ignore - .settings target .project + .settings target .project .classpath Modified: components/wsrp/trunk/wsrp-producer-war/pom.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-08-31 11:14:25 UTC (rev 3980) +++ components/wsrp/trunk/wsrp-producer-war/pom.xml 2010-08-31 13:45:35 UTC (rev 3981) @@ -176,6 +176,9 @@ <descriptor>src/test/assembly/test-resourcenoencodeurl-portlet.xml</descriptor> <descriptor>src/test/assembly/test-applicationscope-portlet.xml</descriptor> <descriptor>src/test/assembly/test-portletstate-portlet.xml</descriptor> + <descriptor>src/test/assembly/test-eventswithobject-portlet.xml</descriptor> + <descriptor>src/test/assembly/test-events-portlet.xml</descriptor> + <descriptor>src/test/assembly/test-portletmodes-portlet.xml</descriptor> </descriptors> </configuration> <executions> Added: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-events-portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-events-portlet.xml (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-events-portlet.xml 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,26 @@ +<assembly> + <id>events-portlet</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> +  + <fileSet> + <directory>target/test-classes</directory> + <outputDirectory>WEB-INF/classes</outputDirectory> + <includes> + <include>org/gatein/wsrp/portlet/EventGeneratorPortlet.class</include> + <include>org/gatein/wsrp/portlet/EventConsumerPortlet.class</include> + </includes> + </fileSet> +  + <fileSet> + <directory>src/test/test-portlets/test-events-portlet-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + +</assembly> + Added: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-eventswithobject-portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-eventswithobject-portlet.xml (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-eventswithobject-portlet.xml 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,26 @@ +<assembly> + <id>eventswithobject-portlet</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> +  + <fileSet> + <directory>target/test-classes</directory> + <outputDirectory>WEB-INF/classes</outputDirectory> + <includes> + <include>org/gatein/wsrp/portlet/EventObject*.class</include> + <include>org/gatein/wsrp/portlet/utils/TestObject.class</include> + </includes> + </fileSet> +  + <fileSet> + <directory>src/test/test-portlets/test-eventswithobject-portlet-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + +</assembly> + Added: components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-portletmodes-portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-portletmodes-portlet.xml (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/assembly/test-portletmodes-portlet.xml 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,25 @@ +<assembly> + <id>portletmodes-portlet</id> + <formats> + <format>war</format> + </formats> + <includeBaseDirectory>false</includeBaseDirectory> + + <fileSets> +  + <fileSet> + <directory>target/test-classes</directory> + <outputDirectory>WEB-INF/classes</outputDirectory> + <includes> + <include>org/gatein/wsrp/portlet/PortletModesPortlet.class</include> + </includes> + </fileSet> +  + <fileSet> + <directory>src/test/test-portlets/test-portletmodes-portlet-war</directory> + <outputDirectory></outputDirectory> + </fileSet> + </fileSets> + +</assembly> + Added: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/EventConsumerPortlet.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/EventConsumerPortlet.java (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/EventConsumerPortlet.java 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,36 @@ +package org.gatein.wsrp.portlet; + +import java.io.IOException; + +import javax.portlet.EventRequest; +import javax.portlet.EventResponse; +import javax.portlet.GenericPortlet; +import javax.portlet.PortletException; +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; + +/** + * EventConsumer Portlet Class + */ +public class EventConsumerPortlet extends GenericPortlet { + + @Override + public void doView(RenderRequest request, RenderResponse response) + throws PortletException, IOException { + response.setContentType("text/html"); + String param = request.getParameter("parameter-event"); + request.setAttribute("parameter", param); + PortletRequestDispatcher dispatcher = getPortletContext() + .getRequestDispatcher("/view_consumer.jsp"); + dispatcher.include(request, response); + } + + @Override + public void processEvent(EventRequest request, EventResponse response) + throws PortletException, IOException { + String param = (String) request.getEvent().getValue(); + response.setRenderParameter("parameter-event", param); + } + +} Added: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/EventGeneratorPortlet.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/EventGeneratorPortlet.java (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/EventGeneratorPortlet.java 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,34 @@ +package org.gatein.wsrp.portlet; + +import java.io.IOException; + +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.GenericPortlet; +import javax.portlet.PortletException; +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; +import javax.xml.namespace.QName; + +/** + * EventGenerator Portlet Class + */ +public class EventGeneratorPortlet extends GenericPortlet { + + @Override + public void doView(RenderRequest request, RenderResponse response) + throws PortletException, IOException { + response.setContentType("text/html"); + PortletRequestDispatcher dispatcher = getPortletContext() + .getRequestDispatcher("/view_generator.jsp"); + dispatcher.include(request, response); + } + + @Override + public void processAction(ActionRequest request, ActionResponse response) + throws PortletException, IOException { + String param = request.getParameter("parameter"); + response.setEvent(new QName("urn:jboss:gatein:samples:event", "eventsample"), param); + } +} Added: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/EventObjectConsumerPortlet.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/EventObjectConsumerPortlet.java (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/EventObjectConsumerPortlet.java 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,46 @@ +package org.gatein.wsrp.portlet; + +import java.io.IOException; + +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.EventRequest; +import javax.portlet.EventResponse; +import javax.portlet.GenericPortlet; +import javax.portlet.PortletException; +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; + +import org.gatein.wsrp.portlet.utils.TestObject; + +/** + * EventObjectConsumer Portlet Class + */ +public class EventObjectConsumerPortlet extends GenericPortlet { + + @Override + public void doView(RenderRequest request, RenderResponse response) + throws PortletException, IOException { + response.setContentType("text/html"); + TestObject object = (TestObject) request.getPortletSession().getAttribute("object"); + request.setAttribute("object", object); + PortletRequestDispatcher dispatcher = getPortletContext() + .getRequestDispatcher("/view_consumer.jsp"); + dispatcher.include(request, response); + } + + @Override + public void processEvent(EventRequest request, EventResponse response) + throws PortletException, IOException { + TestObject object = (TestObject) request.getEvent().getValue(); + request.getPortletSession().setAttribute("object", object); + } + + @Override + public void processAction(ActionRequest request, ActionResponse response) + throws PortletException, IOException { + request.getPortletSession().removeAttribute("object"); + } + +} Added: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/EventObjectGeneratorPortlet.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/EventObjectGeneratorPortlet.java (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/EventObjectGeneratorPortlet.java 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,60 @@ +package org.gatein.wsrp.portlet; + +import java.io.IOException; +import java.util.ArrayList; +import java.util.List; + +import javax.portlet.ActionRequest; +import javax.portlet.ActionResponse; +import javax.portlet.GenericPortlet; +import javax.portlet.PortletException; +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; +import javax.xml.namespace.QName; + +import org.gatein.wsrp.portlet.utils.TestObject; + +/** + * EventObjectGenerator Portlet Class + */ +public class EventObjectGeneratorPortlet extends GenericPortlet { + + private List<TestObject> objects; + + @Override + public void init() throws PortletException { + super.init(); + objects = new ArrayList<TestObject>(); + objects.add(new TestObject("Prabhat", "Jha", "pjha", 654321, "pjha(a)redhat.com")); + objects.add(new TestObject("Michal", "Vanco", "mvanco", 123456, "mvanco(a)redhat.com")); + objects.add(new TestObject("Marek", "Posolda", "mposolda", 112233, "mposolda(a)redhat.com")); + objects.add(new TestObject("Viliam", "Rockai", "vrockai", 223311, "vrockai(a)redhat.com")); + } + + public TestObject getTestObjectByUserName(String username) { + for (TestObject object : objects) { + if (object.getUsername().equals(username)) { + return object; + } + } + return null; + } + + @Override + public void doView(RenderRequest request, RenderResponse response) + throws PortletException, IOException { + response.setContentType("text/html"); + request.setAttribute("objects", objects); + PortletRequestDispatcher dispatcher = getPortletContext() + .getRequestDispatcher("/view_generator.jsp"); + dispatcher.include(request, response); + } + + @Override + public void processAction(ActionRequest request, ActionResponse response) + throws PortletException, IOException { + String username = request.getParameter("username"); + response.setEvent(new QName("urn:jboss:gatein:samples:event:object", "eventObject"), getTestObjectByUserName(username)); + } +} Added: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/PortletModesPortlet.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/PortletModesPortlet.java (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/PortletModesPortlet.java 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,52 @@ +package org.gatein.wsrp.portlet; + +import java.io.IOException; + +import javax.portlet.GenericPortlet; +import javax.portlet.PortletException; +import javax.portlet.PortletRequestDispatcher; +import javax.portlet.RenderMode; +import javax.portlet.RenderRequest; +import javax.portlet.RenderResponse; + +/** + * PortletModes Class + */ +public class PortletModesPortlet extends GenericPortlet { + + @Override + public void doView(RenderRequest request, RenderResponse response) + throws PortletException, IOException { + response.setContentType("text/html"); + PortletRequestDispatcher dispatcher = getPortletContext() + .getRequestDispatcher("/view.jsp"); + dispatcher.include(request, response); + } + + @Override + public void doHelp(RenderRequest request, RenderResponse response) + throws PortletException, IOException { + response.setContentType("text/html"); + PortletRequestDispatcher dispatcher = getPortletContext() + .getRequestDispatcher("/help.jsp"); + dispatcher.include(request, response); + } + + @Override + public void doEdit(RenderRequest request, RenderResponse response) + throws PortletException, IOException { + response.setContentType("text/html"); + PortletRequestDispatcher dispatcher = getPortletContext() + .getRequestDispatcher("/edit.jsp"); + dispatcher.include(request, response); + } + + @RenderMode(name = "TEST_MODE") + public void doTestMode(RenderRequest request, RenderResponse response) + throws PortletException, IOException { + response.setContentType("text/html"); + PortletRequestDispatcher dispatcher = getPortletContext() + .getRequestDispatcher("/test_mode.jsp"); + dispatcher.include(request, response); + } +} Added: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/utils/TestObject.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/utils/TestObject.java (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/portlet/utils/TestObject.java 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,110 @@ +package org.gatein.wsrp.portlet.utils; + +import java.io.Serializable; + +import javax.xml.bind.annotation.XmlRootElement; + +@XmlRootElement +public class TestObject implements Serializable { + + private static final long serialVersionUID = 1L; + + private String firstName; + private String lastName; + private String username; + private Integer employeeNumber; + private String email; + + public TestObject() { + } + + public TestObject(String firstName, String lastName, String username, + Integer employeeNumber, String email) { + this.firstName = firstName; + this.lastName = lastName; + this.username = username; + this.employeeNumber = employeeNumber; + this.email = email; + } + + public TestObject(TestObject object) { + this.firstName = object.getFirstName(); + this.lastName = object.getLastName(); + this.username = object.getUsername(); + this.employeeNumber = object.getEmployeeNumber(); + this.email = object.getEmail(); + } + + public String getFirstName() { + return firstName; + } + + public void setFirstName(String firstName) { + this.firstName = firstName; + } + + public String getLastName() { + return lastName; + } + + public void setLastName(String lastName) { + this.lastName = lastName; + } + + public String getUsername() { + return username; + } + + public void setUsername(String username) { + this.username = username; + } + + public Integer getEmployeeNumber() { + return employeeNumber; + } + + public void setEmployeeNumber(Integer employeeNumber) { + this.employeeNumber = employeeNumber; + } + + public String getEmail() { + return email; + } + + public void setEmail(String email) { + this.email = email; + } + + @Override + public boolean equals(Object obj) { + if (obj instanceof TestObject) { + TestObject object = (TestObject) obj; + if (this.getUsername().equals(object.getUsername())) + return true; + } + return false; + + } + + @Override + public int hashCode() { + return super.hashCode() + this.getUsername().hashCode(); + } + + @Override + public String toString() { + StringBuilder builder = new StringBuilder(); + builder.append("TestObject: "); + builder.append(firstName); + builder.append(", "); + builder.append(lastName); + builder.append(", "); + builder.append(username); + builder.append(", "); + builder.append(employeeNumber); + builder.append(", "); + builder.append(email); + builder.append("."); + return builder.toString(); + } +} Modified: components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java 2010-08-31 11:14:25 UTC (rev 3980) +++ components/wsrp/trunk/wsrp-producer-war/src/test/java/org/gatein/wsrp/protocol/v2/MarkupTestCase.java 2010-08-31 13:45:35 UTC (rev 3981) @@ -731,8 +731,84 @@ undeploy(archive); } } + + @Test + public void testGetMarkupWithEventsAndObjects() throws Exception + { + undeploy(DEFAULT_MARKUP_PORTLET_WAR); + String archive = "test-eventswithobject-portlet.war"; + deploy(archive); + NamedString namedString = createNamedString("username", "pjha"); + try + { + List<String> handles = getHandlesForCurrentlyDeployedArchive(); + String generatorHandle = null; + String consumerHandle = null; + for (String portletHandle : handles) + { + if (portletHandle.contains("Generator")) + { + generatorHandle = portletHandle; + } else if (portletHandle.contains("Consumer")) + { + consumerHandle = portletHandle; + } + } + PerformBlockingInteraction action = WSRPTypeFactory.createDefaultPerformBlockingInteraction(generatorHandle); + List<NamedString> formParameters = action.getInteractionParams().getFormParameters(); + formParameters.add(namedString); + BlockingInteractionResponse actionResponse = producer.performBlockingInteraction(action); + GetMarkup markupRequestConsumer = createMarkupRequest(consumerHandle); + markupRequestConsumer.getMarkupParams().setNavigationalContext(actionResponse.getUpdateResponse().getNavigationalContext()); + MarkupResponse response = producer.getMarkup(markupRequestConsumer); + checkMarkupResponse(response, "Prabhat"); + } + finally + { + undeploy(archive); + } + } + @Test + public void testGetMarkupWithSimpleEvent() throws Exception + { + undeploy(DEFAULT_MARKUP_PORTLET_WAR); + String archive = "test-events-portlet.war"; + deploy(archive); + + NamedString namedString = createNamedString("parameter", "param-value"); + try + { + List<String> handles = getHandlesForCurrentlyDeployedArchive(); + String generatorHandle = null; + String consumerHandle = null; + for (String portletHandle : handles) + { + if (portletHandle.contains("Generator")) + { + generatorHandle = portletHandle; + } else if (portletHandle.contains("Consumer")) + { + consumerHandle = portletHandle; + } + } + PerformBlockingInteraction action = WSRPTypeFactory.createDefaultPerformBlockingInteraction(generatorHandle); + List<NamedString> formParameters = action.getInteractionParams().getFormParameters(); + formParameters.add(namedString); + BlockingInteractionResponse actionResponse = producer.performBlockingInteraction(action); + GetMarkup markupRequestConsumer = createMarkupRequest(consumerHandle); + markupRequestConsumer.getMarkupParams().setNavigationalContext(actionResponse.getUpdateResponse().getNavigationalContext()); + MarkupResponse response = producer.getMarkup(markupRequestConsumer); + checkMarkupResponse(response, "param-value"); + } + finally + { + undeploy(archive); + } + } + + @Test public void testGetMarkupNoRegistrationWhenRegistrationRequired() throws Exception { configureRegistrationSettings(true, false); Added: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-events-portlet-war/WEB-INF/portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-events-portlet-war/WEB-INF/portlet.xml (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-events-portlet-war/WEB-INF/portlet.xml 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,81 @@ +<?xml version="1.0" encoding="UTF-8"?> +  +<portlet-app xmlns='http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' + xsi:schemaLocation='http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd' + version='2.0'> + <portlet> + <description>Event Generator</description> + <portlet-name>Event Generator</portlet-name> + <display-name>Event Generator</display-name> + <portlet-class>org.gatein.wsrp.portlet.EventGeneratorPortlet</portlet-class> + <expiration-cache>0</expiration-cache> + + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>VIEW</portlet-mode> + </supports> + + <portlet-info> + <title>Event Generator sample</title> + <short-title>Event Generator sample</short-title> + </portlet-info> + + <supported-publishing-event> + <qname xmlns:gtn="urn:jboss:gatein:samples:event">gtn:eventsample</qname> + </supported-publishing-event> + </portlet> + + <portlet> + <description>Event Consumer</description> + <portlet-name>Event Consumer</portlet-name> + <display-name>Event Consumer</display-name> + <portlet-class>org.gatein.wsrp.portlet.EventConsumerPortlet</portlet-class> + <expiration-cache>0</expiration-cache> + + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>VIEW</portlet-mode> + </supports> + + <portlet-info> + <title>Event Consumer sample</title> + <short-title>Event Consumer sample</short-title> + </portlet-info> + + <supported-processing-event> + <qname xmlns:gtn="urn:jboss:gatein:samples:event">gtn:eventsample</qname> + </supported-processing-event> + </portlet> + + <event-definition> + <qname xmlns:gtn="urn:jboss:gatein:samples:event">gtn:eventsample</qname> + <value-type>java.lang.String</value-type> + </event-definition> + +  + <container-runtime-option> + <name>org.gatein.pc.remotable</name> + <value>true</value> + </container-runtime-option> + +</portlet-app> Added: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-events-portlet-war/WEB-INF/web.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-events-portlet-war/WEB-INF/web.xml (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-events-portlet-war/WEB-INF/web.xml 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<web-app version="2.4" + xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> +</web-app> \ No newline at end of file Added: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-events-portlet-war/view_consumer.jsp =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-events-portlet-war/view_consumer.jsp (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-events-portlet-war/view_consumer.jsp 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,16 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> +<portlet:defineObjects/> +<br /> +<c:choose> + <c:when test='${empty parameter}'> + Please fill in your name at Event Generator portlet to see if eventing works.<br /> + </c:when> + <c:otherwise> + <h1>Welcome ${parameter}!</h1> + Thanks for submiting your name, if you can see your name above -> events works properly.<br /> + </c:otherwise> +</c:choose> +<br /> \ No newline at end of file Added: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-events-portlet-war/view_generator.jsp =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-events-portlet-war/view_generator.jsp (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-events-portlet-war/view_generator.jsp 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,13 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> +<portlet:defineObjects/> +<br /> +<h1>Hello!</h1> +This is sample portlet to verify events.<br /> +Please type in your name and submit. <br /><br /> +<portlet:actionURL name="submit" var="submit" /> +<form method="post" action="${submit}"> +Your name: <input type="text" name="parameter"/> <input type="submit" value="Submit"> +</form> +<br /> Added: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-eventswithobject-portlet-war/WEB-INF/portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-eventswithobject-portlet-war/WEB-INF/portlet.xml (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-eventswithobject-portlet-war/WEB-INF/portlet.xml 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,83 @@ +<?xml version="1.0" encoding="UTF-8"?> +  +<portlet-app xmlns='http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' + xsi:schemaLocation='http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd' + version='2.0'> + <portlet> + <description>Event Object Generator</description> + <portlet-name>Event Object Generator</portlet-name> + <display-name>Event Object Generator</display-name> + <portlet-class>org.gatein.wsrp.portlet.EventObjectGeneratorPortlet</portlet-class> + <expiration-cache>0</expiration-cache> + + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>VIEW</portlet-mode> + </supports> + + <portlet-info> + <title>Event Object Generator sample</title> + <short-title>Event Object Generator sample</short-title> + </portlet-info> + + <supported-publishing-event> + <qname xmlns:gtn="urn:jboss:gatein:samples:event:object">gtn:eventObject</qname> + </supported-publishing-event> + </portlet> + + <portlet> + <description>Event Object Consumer</description> + <portlet-name>Event Object Consumer</portlet-name> + <display-name>Event Object Consumer</display-name> + <portlet-class>org.gatein.wsrp.portlet.EventObjectConsumerPortlet</portlet-class> + <expiration-cache>0</expiration-cache> + + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>VIEW</portlet-mode> + </supports> + + <portlet-info> + <title>Event Object Consumer sample</title> + <short-title>Event Object Consumer sample</short-title> + </portlet-info> + + <supported-processing-event> + <qname xmlns:gtn="urn:jboss:gatein:samples:event:object">gtn:eventObject</qname> + </supported-processing-event> + + </portlet> + + <event-definition> + <qname xmlns:gtn="urn:jboss:gatein:samples:event:object">gtn:eventObject</qname> + <value-type>org.gatein.wsrp.portlet.utils.TestObject</value-type> + </event-definition> + + +  + <container-runtime-option> + <name>org.gatein.pc.remotable</name> + <value>true</value> + </container-runtime-option> + +</portlet-app> Added: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-eventswithobject-portlet-war/WEB-INF/web.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-eventswithobject-portlet-war/WEB-INF/web.xml (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-eventswithobject-portlet-war/WEB-INF/web.xml 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<web-app version="2.4" + xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> +</web-app> \ No newline at end of file Added: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-eventswithobject-portlet-war/view_consumer.jsp =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-eventswithobject-portlet-war/view_consumer.jsp (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-eventswithobject-portlet-war/view_consumer.jsp 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,24 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> +<portlet:defineObjects/> +<c:choose> + <c:when test='${empty object}'> + <br /> + Please select user at Event Object Generator portlet to see if eventing with object works.<br /> + </c:when> + <c:otherwise> + <h1>Thanks for selection!</h1> + You have selected following user: <br /><br /> + <b>${object.firstName}, ${object.lastName}, ${object.username}, ${object.employeeNumber}, ${object.email}</b> + <br /> + <br /> + If you can see selected user above, events with objects works properly!<br /> + <portlet:actionURL name="clean" var="clean" /> + <form method="post" action="${clean}"> + <input type="submit" value="Clear selection"> + </form> + </c:otherwise> +</c:choose> +<br /> \ No newline at end of file Added: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-eventswithobject-portlet-war/view_generator.jsp =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-eventswithobject-portlet-war/view_generator.jsp (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-eventswithobject-portlet-war/view_generator.jsp 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,37 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> +<%@ taglib uri="http://java.sun.com/jstl/core_rt" prefix="c" %> +<portlet:defineObjects/> +<h1>Hello!</h1> +This is sample portlet to verify object passing through events.<br /> +Please click on any select button below to pass event with object (user).<br /> +<br /> +<table align="center"> + <thead> + <tr> + <th>First Name</th> + <th>Lasst Name</th> + <th>Username</th> + <th>Employee number</th> + <th>Email</th> + <th>Select</th> + </tr> + </thead> + <tbody> + <c:forEach items="${objects}" var="user"> + <portlet:actionURL name="select" var="select"> + <portlet:param name="username" value="${user.username}" /> + </portlet:actionURL> + <tr> + <td align="center">${user.firstName}</td> + <td align="center">${user.lastName}</td> + <td align="center">${user.username}</td> + <td align="center">${user.employeeNumber}</td> + <td align="center">${user.email}</td> + <td align="center"><form method="post" action="${select}"><input type="submit" value="Select" /></form></td> + </tr> + </c:forEach> + </tbody> +</table> +<br /> Added: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/WEB-INF/portlet.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/WEB-INF/portlet.xml (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/WEB-INF/portlet.xml 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,59 @@ +<?xml version="1.0" encoding="UTF-8"?> +  +<portlet-app xmlns='http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd' + xmlns:xsi='http://www.w3.org/2001/XMLSchema-instance' + xsi:schemaLocation='http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd http://java.sun.com/xml/ns/portlet/portlet-app_2_0.xsd' + version='2.0'> + <portlet> + <description>Portlet Modes</description> + <portlet-name>Portlet Modes</portlet-name> + <display-name>Portlet Modes</display-name> + <portlet-class>org.gatein.wsrp.portlet.PortletModesPortlet</portlet-class> + <expiration-cache>0</expiration-cache> + + <supports> + <mime-type>text/html</mime-type> + <portlet-mode>VIEW</portlet-mode> + <portlet-mode>EDIT</portlet-mode> + <portlet-mode>HELP</portlet-mode> + <portlet-mode>TEST_MODE</portlet-mode> + </supports> + + <portlet-info> + <title>Portlet Modes sample</title> + <short-title>Portlet Modes sample</short-title> + </portlet-info> + </portlet> + + <custom-portlet-mode> + <description>Test mode</description> + <portlet-mode>TEST_MODE</portlet-mode> + <portal-managed>false</portal-managed> + </custom-portlet-mode> + +  + <container-runtime-option> + <name>org.gatein.pc.remotable</name> + <value>true</value> + </container-runtime-option> + +</portlet-app> Added: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/WEB-INF/web.xml =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/WEB-INF/web.xml (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/WEB-INF/web.xml 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,30 @@ +<?xml version="1.0" encoding="UTF-8"?> + + + +<web-app version="2.4" + xmlns="http://java.sun.com/xml/ns/j2ee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"> +</web-app> \ No newline at end of file Added: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/edit.jsp =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/edit.jsp (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/edit.jsp 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,7 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> +<portlet:defineObjects/> +<br /> +<b>This is EDIT MODE.</b> +<br /><br /> Added: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/help.jsp =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/help.jsp (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/help.jsp 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,7 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> +<portlet:defineObjects/> +<br /> +<b>This is HELP MODE.</b> +<br /><br /> \ No newline at end of file Added: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/test_mode.jsp =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/test_mode.jsp (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/test_mode.jsp 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,7 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> +<portlet:defineObjects/> +<br /> +<b>This is TEST MODE.</b> +<br /><br /> Added: components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/view.jsp =================================================================== --- components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/view.jsp (rev 0) +++ components/wsrp/trunk/wsrp-producer-war/src/test/test-portlets/test-portletmodes-portlet-war/view.jsp 2010-08-31 13:45:35 UTC (rev 3981) @@ -0,0 +1,9 @@ +<%@page contentType="text/html"%> +<%@page pageEncoding="UTF-8"%> +<%@ taglib uri="http://java.sun.com/portlet_2_0" prefix="portlet" %> +<portlet:defineObjects/> +<h1>Hello!</h1> +This is sample portlet to verify portlet modes.<br /> +Change portlet mode at upper right corner to verify correct functionality.<br /><br /> +<b>This is VIEW MODE.</b> +<br /><br />

13 years, 10 months

1
0
0 / 0

gatein SVN: r3980 - in components/shindig/trunk: features and 6 other directories.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-08-31 07:14:25 -0400 (Tue, 31 Aug 2010) New Revision: 3980 Modified: components/shindig/trunk/features/pom.xml components/shindig/trunk/java/common/pom.xml components/shindig/trunk/java/gadgets/pom.xml components/shindig/trunk/java/pom.xml components/shindig/trunk/java/samples/pom.xml components/shindig/trunk/java/server/pom.xml components/shindig/trunk/java/social-api/pom.xml components/shindig/trunk/pom.xml Log: Prepare for next release Modified: components/shindig/trunk/features/pom.xml =================================================================== --- components/shindig/trunk/features/pom.xml 2010-08-31 11:10:13 UTC (rev 3979) +++ components/shindig/trunk/features/pom.xml 2010-08-31 11:14:25 UTC (rev 3980) @@ -23,7 +23,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version>1.0-r790473-Patch03</version> + <version>1.0-r790473-Patch04-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/java/common/pom.xml =================================================================== --- components/shindig/trunk/java/common/pom.xml 2010-08-31 11:10:13 UTC (rev 3979) +++ components/shindig/trunk/java/common/pom.xml 2010-08-31 11:14:25 UTC (rev 3980) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch03</version> + <version>1.0-r790473-Patch04-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/java/gadgets/pom.xml =================================================================== --- components/shindig/trunk/java/gadgets/pom.xml 2010-08-31 11:10:13 UTC (rev 3979) +++ components/shindig/trunk/java/gadgets/pom.xml 2010-08-31 11:14:25 UTC (rev 3980) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch03</version> + <version>1.0-r790473-Patch04-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/java/pom.xml =================================================================== --- components/shindig/trunk/java/pom.xml 2010-08-31 11:10:13 UTC (rev 3979) +++ components/shindig/trunk/java/pom.xml 2010-08-31 11:14:25 UTC (rev 3980) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version>1.0-r790473-Patch03</version> + <version>1.0-r790473-Patch04-SNAPSHOT</version> </parent> <artifactId>shindig-parent</artifactId> Modified: components/shindig/trunk/java/samples/pom.xml =================================================================== --- components/shindig/trunk/java/samples/pom.xml 2010-08-31 11:10:13 UTC (rev 3979) +++ components/shindig/trunk/java/samples/pom.xml 2010-08-31 11:14:25 UTC (rev 3980) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch03</version> + <version>1.0-r790473-Patch04-SNAPSHOT</version> </parent> <artifactId>shindig-samples</artifactId> Modified: components/shindig/trunk/java/server/pom.xml =================================================================== --- components/shindig/trunk/java/server/pom.xml 2010-08-31 11:10:13 UTC (rev 3979) +++ components/shindig/trunk/java/server/pom.xml 2010-08-31 11:14:25 UTC (rev 3980) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch03</version> + <version>1.0-r790473-Patch04-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/java/social-api/pom.xml =================================================================== --- components/shindig/trunk/java/social-api/pom.xml 2010-08-31 11:10:13 UTC (rev 3979) +++ components/shindig/trunk/java/social-api/pom.xml 2010-08-31 11:14:25 UTC (rev 3980) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch03</version> + <version>1.0-r790473-Patch04-SNAPSHOT</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/pom.xml =================================================================== --- components/shindig/trunk/pom.xml 2010-08-31 11:10:13 UTC (rev 3979) +++ components/shindig/trunk/pom.xml 2010-08-31 11:14:25 UTC (rev 3980) @@ -28,7 +28,7 @@ <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version>1.0-r790473-Patch03</version> + <version>1.0-r790473-Patch04-SNAPSHOT</version> <packaging>pom</packaging> <name>Apache Shindig Project</name>

13 years, 10 months

1
0
0 / 0

gatein SVN: r3979 - components/shindig/tags.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-08-31 07:10:13 -0400 (Tue, 31 Aug 2010) New Revision: 3979 Added: components/shindig/tags/1.0-r790473-Patch03/ Log: Tagging Shindig Patch 03 Copied: components/shindig/tags/1.0-r790473-Patch03 (from rev 3978, components/shindig/trunk)

13 years, 10 months

1
0
0 / 0

gatein SVN: r3978 - portal/branches/branched-r3845/component/portal/src/test/resources/conf.

by do-not-reply＠jboss.org

Author: trong.tran Date: 2010-08-31 06:32:50 -0400 (Tue, 31 Aug 2010) New Revision: 3978 Added: portal/branches/branched-r3845/component/portal/src/test/resources/conf/test-mop-nodetypes.xml Modified: portal/branches/branched-r3845/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration1.xml Log: Fix testcase failed Modified: portal/branches/branched-r3845/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration1.xml =================================================================== --- portal/branches/branched-r3845/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration1.xml 2010-08-31 10:18:43 UTC (rev 3977) +++ portal/branches/branched-r3845/component/portal/src/test/resources/conf/exo.portal.component.portal-configuration1.xml 2010-08-31 10:32:50 UTC (rev 3978) @@ -130,6 +130,7 @@ <value>jar:/conf/gatein-nodetypes.xml</value> <value>jar:/conf/mop-nodetypes.xml</value> <value>jar:/conf/content-nodetypes.xml</value> + <value>jar:/conf/test-mop-nodetypes.xml</value> </values-param> </init-params> </component-plugin> @@ -189,6 +190,7 @@ <value>org.exoplatform.portal.mop.ProtectedResource</value> <value>org.exoplatform.portal.mop.Described</value> <value>org.exoplatform.portal.mop.Visible</value> + <value>org.exoplatform.portal.config.SampleMixin</value> </values-param> </init-params> </component-plugin> Added: portal/branches/branched-r3845/component/portal/src/test/resources/conf/test-mop-nodetypes.xml =================================================================== --- portal/branches/branched-r3845/component/portal/src/test/resources/conf/test-mop-nodetypes.xml (rev 0) +++ portal/branches/branched-r3845/component/portal/src/test/resources/conf/test-mop-nodetypes.xml 2010-08-31 10:32:50 UTC (rev 3978) @@ -0,0 +1,29 @@ + +<nodeTypes xmlns:nt="http://www.jcp.org/jcr/nt/1.0" xmlns:mix="http://www.jcp.org/jcr/mix/1.0" xmlns:jcr="http://www.jcp.org/jcr/1.0"> + + <nodeType name="gtn:sampleMixin" isMixin="true" hasOrderableChildNodes="false" primaryItemName=""> + <propertyDefinitions> + <propertyDefinition name="gtn:sampleProperty" requiredType="String" autoCreated="false" mandatory="false" onParentVersion="COPY" protected="false" multiple="true"> + <valueConstraints/> + </propertyDefinition> + </propertyDefinitions> + </nodeType> + +</nodeTypes>

13 years, 10 months

1
0
0 / 0

gatein SVN: r3977 - portal/branches/branched-r3845/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component.

by do-not-reply＠jboss.org

Author: phuong_vu Date: 2010-08-31 06:18:43 -0400 (Tue, 31 Aug 2010) New Revision: 3977 Modified: portal/branches/branched-r3845/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java Log: GTNPORTAL-1440 Show gadget wrong after continue click Click here to add into categories link Modified: portal/branches/branched-r3845/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java =================================================================== --- portal/branches/branched-r3845/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java 2010-08-31 10:12:53 UTC (rev 3976) +++ portal/branches/branched-r3845/portlet/exoadmin/src/main/java/org/exoplatform/applicationregistry/webui/component/UICategorySelector.java 2010-08-31 10:18:43 UTC (rev 3977) @@ -1,5 +1,6 @@ package org.exoplatform.applicationregistry.webui.component; +import org.apache.shindig.gadgets.Gadget; import org.exoplatform.application.registry.Application; import org.exoplatform.application.registry.ApplicationCategory; import org.exoplatform.application.registry.ApplicationRegistryService; @@ -142,7 +143,14 @@ appInfo.getChild(UICategorySelector.class).setRendered(false); UIApplicationRegistryPortlet uiPortlet = appInfo.getAncestorOfType(UIApplicationRegistryPortlet.class); UIApplicationOrganizer uiOrganizer = uiPortlet.getChild(UIApplicationOrganizer.class); + UIGadgetManagement uiGadgetManagement = uiPortlet.getChild(UIGadgetManagement.class); + uiOrganizer.reload(); + if (uiGadgetManagement != null) + { + uiGadgetManagement.setSelectedGadget(selector.getApplication().getApplicationName()); + } + event.getRequestContext().addUIComponentToUpdateByAjax(appInfo); }

13 years, 10 months

1
0
0 / 0

gatein SVN: r3976 - portal/branches/branched-r3845/component/web/resources/src/main/java/org/exoplatform/portal/resource.

by do-not-reply＠jboss.org

Author: phuong_vu Date: 2010-08-31 06:12:53 -0400 (Tue, 31 Aug 2010) New Revision: 3976 Modified: portal/branches/branched-r3845/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java Log: GTNPORTAL-1199 Wrong parsing css file when this css is already compressed Modified: portal/branches/branched-r3845/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java =================================================================== --- portal/branches/branched-r3845/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java 2010-08-31 09:25:26 UTC (rev 3975) +++ portal/branches/branched-r3845/component/web/resources/src/main/java/org/exoplatform/portal/resource/SkinService.java 2010-08-31 10:12:53 UTC (rev 3976) @@ -33,7 +33,6 @@ import org.exoplatform.management.jmx.annotations.Property; import org.exoplatform.management.rest.annotations.RESTEndpoint; import org.exoplatform.portal.resource.compressor.ResourceCompressor; -import org.exoplatform.portal.resource.compressor.ResourceCompressorException; import org.exoplatform.portal.resource.compressor.ResourceType; import org.exoplatform.services.log.ExoLogger; import org.exoplatform.services.log.Log; @@ -88,17 +87,17 @@ /** Immutable and therefore thread safe. */ private static final Pattern IMPORT_PATTERN = - Pattern.compile("(@import\\s+" + "url" + LEFT_P + "['\"]?" + ")([^'\"]+.css)(" + "['\"]?" + RIGHT_P + "\\s*;)"); + Pattern.compile("(@import\\s+" + "url" + LEFT_P + "['\"]?" + ")([^'\";]+.css)(" + "['\"]?" + RIGHT_P + "\\s*;)"); /** Immutable and therefore thread safe. */ private static final Pattern BACKGROUND_PATTERN = - Pattern.compile("(background.*:.*url" + LEFT_P + "['\"]?" + ")([^'\"]+)(" + "['\"]?" + RIGHT_P + ".*;)"); + Pattern.compile("(background[^;]+url" + LEFT_P + "['\"]?" + ")([^'\";]+)(" + "['\"]?" + RIGHT_P + "[^;]*;)"); /** Immutable and therefore thread safe. */ - private static final Pattern LT = Pattern.compile("/\\*\\s*orientation=lt\\s*\\*/"); + private static final Pattern LT = Pattern.compile("[^{;]*;\\s*/\\*\\s*orientation=lt\\s*\\*/"); /** Immutable and therefore thread safe. */ - private static final Pattern RT = Pattern.compile("/\\*\\s*orientation=rt\\s*\\*/"); + private static final Pattern RT = Pattern.compile("[^{;]*;\\s*/\\*\\s*orientation=rt\\s*\\*/"); /** One month caching. */ private static final int ONE_MONTH = 2592000; @@ -455,7 +454,7 @@ CachedStylesheet cachedCss = cache.get(path); if (cachedCss == null) { - StringBuilder sb = new StringBuilder(); + StringBuffer sb = new StringBuffer(); processCSS(sb, path, orientation, true); String css; try @@ -650,7 +649,7 @@ } return resource; } - + /** * Apply CSS of skin * @param appendable @@ -663,7 +662,7 @@ private void processCSS(Appendable appendable, String cssPath, Orientation orientation, boolean merge) throws RenderingException, IOException { - Resource skin = getCSSResource(cssPath, cssPath); + Resource skin = getCSSResource(cssPath, cssPath); processCSSRecursively(appendable, merge, skin, orientation); } @@ -680,7 +679,6 @@ private void processCSSRecursively(Appendable appendable, boolean merge, Resource skin, Orientation orientation) throws RenderingException, IOException { - if(skin == null) { return; @@ -695,55 +693,43 @@ { throw new RenderingException("No skin resolved for path " + skin.getResourcePath()); } - BufferedReader reader = new BufferedReader(tmp); + BufferedReader reader = new BufferedReader(tmp); try { while ((line = reader.readLine()) != null) - { + { + line = proccessOrientation(line, orientation); + line = proccessBackgroundUrl(line, basePath); + Matcher matcher = IMPORT_PATTERN.matcher(line); - if (matcher.find()) + while (matcher.find()) { - String includedPath = matcher.group(2); - if (includedPath.startsWith("/")) + String includedPath = matcher.group(2); + if (!includedPath.startsWith("/")) { - if (merge) - { - Resource ssskin = getCSSResource(includedPath, basePath + skin.getFileName()); - processCSSRecursively(appendable, merge, ssskin, orientation); - } - else - { - appendable.append(matcher.group(1)).append( - includedPath.substring(0, includedPath.length() - ".css".length())).append( - getSuffix(orientation)).append(matcher.group(3)).append("\n"); - } + includedPath = basePath + includedPath; } - else - { - if (merge) - { - String path = skin.getContextPath() + skin.getParentPath() + includedPath; - Resource ssskin = getCSSResource(path, basePath + skin.getFileName()); - processCSSRecursively(appendable, merge, ssskin, orientation); - } - else - { - appendable.append(matcher.group(1)); - appendable.append(basePath); - appendable.append(includedPath.substring(0, includedPath.length() - ".css".length())); - appendable.append(getSuffix(orientation)); - appendable.append(matcher.group(3)); - } - } + + String embeddedPath = includedPath.substring(0, includedPath.length() - ".css".length()); + StringBuffer strReplace = new StringBuffer(); + if (merge) + { + Resource ssskin = getCSSResource(includedPath, basePath + skin.getFileName()); + processCSSRecursively(strReplace, merge, ssskin, orientation); + } + else + { + strReplace.append(matcher.group(1)); + strReplace.append(embeddedPath); + strReplace.append(getSuffix(orientation)); + strReplace.append(matcher.group(3)); + } + String str = strReplace.toString().replaceAll("\\$", "\\\\\\$"); + matcher.appendReplacement((StringBuffer)appendable, str); } - else - { - if (orientation == null || wantInclude(line, orientation)) - { - append(line, basePath, appendable); - } - } - } + matcher.appendTail((StringBuffer)appendable); + appendable.append("\n"); + } } finally { @@ -751,39 +737,43 @@ } } - /** - * Filter what if it's annotated with the alternative orientation. - * - * @param line - * the line to include - * @param orientation - * the orientation - * @return true if the line is included - */ - private boolean wantInclude(String line, Orientation orientation) + private String proccessBackgroundUrl(String line, String basePath) { - Pattern orientationPattern = orientation == Orientation.LT ? RT : LT; - Matcher matcher2 = orientationPattern.matcher(line); - return !matcher2.find(); - } - - /** - * Rewrite background url pattern - */ - private void append(String line, String basePath, Appendable appendable) throws IOException - { // Rewrite background url pattern Matcher matcher = BACKGROUND_PATTERN.matcher(line); - if (matcher.find() && !matcher.group(2).startsWith("\"/") && !matcher.group(2).startsWith("'/") - && !matcher.group(2).startsWith("/")) + + StringBuffer tmpBuilder = new StringBuffer(); + while (matcher.find()) { - appendable.append(matcher.group(1)).append(basePath).append(matcher.group(2)).append(matcher.group(3)).append( - '\n'); + if (!matcher.group(2).startsWith("\"/")) { + if (!matcher.group(2).startsWith("'/")) { + if (!matcher.group(2).startsWith("/")) { + StringBuilder strReplace = new StringBuilder(); + strReplace.append(matcher.group(1)); + strReplace.append(basePath); + strReplace.append(matcher.group(2)); + strReplace.append(matcher.group(3)); + + matcher.appendReplacement(tmpBuilder, strReplace.toString()); + } + } + } } - else + matcher.appendTail(tmpBuilder); + return tmpBuilder.toString(); + } + + private String proccessOrientation(String line, Orientation orientation) + { + Pattern orientationPattern = orientation == Orientation.LT ? RT : LT; + Matcher matcher = orientationPattern.matcher(line); + StringBuffer tmpBuilder = new StringBuffer(); + while (matcher.find()) { - appendable.append(line).append('\n'); + matcher.appendReplacement(tmpBuilder, ""); } + matcher.appendTail(tmpBuilder); + return tmpBuilder.toString(); } /**

13 years, 10 months

1
0
0 / 0

gatein SVN: r3975 - portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization.

by do-not-reply＠jboss.org

Author: mstruk Date: 2010-08-31 05:25:26 -0400 (Tue, 31 Aug 2010) New Revision: 3975 Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/DefaultLocalePolicyService.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationLifecycle.java Log: GTNPORTAL-1302: Previous fix overwritten by GTNPORTAL-1306 work. Now fixed again. Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/DefaultLocalePolicyService.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/DefaultLocalePolicyService.java 2010-08-31 07:41:49 UTC (rev 3974) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/DefaultLocalePolicyService.java 2010-08-31 09:25:26 UTC (rev 3975) @@ -32,9 +32,13 @@ * This service represents a default policy for determining LocaleConfig to be used for user's session. * This service is registered through portal services configuration file: conf/portal/configuration.xml * Custom locale determination policy can be implemented by overriding or completely replacing this class, - * and registering an alternative implementation. + * and registering an alternative implementation. Special care needs to be taken to assure Locale consistency + * between portal requests and non-portal requests - like login redirect upon failed authentication attempt. + * To keep consistency at least one of {@link LocaleContextInfo#cookieLocales} and {@link LocaleContextInfo#sessionLocale} + * needs to be enabled. * * @see NoBrowserLocalePolicyService + * @see LocalizationFilter * * @author <a href="mailto:mstrukel@redhat.com">Marko Strukelj</a> */ Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java 2010-08-31 07:41:49 UTC (rev 3974) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationFilter.java 2010-08-31 09:25:26 UTC (rev 3975) @@ -197,7 +197,7 @@ } String lang = userProfile == null ? null : userProfile.getUserInfoMap().get(Constants.USER_LANGUAGE); - return (lang != null) ? new Locale(lang) : null; + return (lang != null) ? LocaleContextInfo.getLocale(lang) : null; } public void beginContext(OrganizationService orgService) throws Exception Modified: portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationLifecycle.java =================================================================== --- portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationLifecycle.java 2010-08-31 07:41:49 UTC (rev 3974) +++ portal/trunk/webui/portal/src/main/java/org/exoplatform/portal/application/localization/LocalizationLifecycle.java 2010-08-31 09:25:26 UTC (rev 3975) @@ -240,7 +240,7 @@ UserProfile userProfile = getLoadedProfile(context); lang = userProfile == null ? null : userProfile.getUserInfoMap().get(Constants.USER_LANGUAGE); - return (lang != null) ? new Locale(lang) : null; + return (lang != null) ? LocaleContextInfo.getLocale(lang) : null; } private UserProfile loadUserProfile(ExoContainer container, PortalRequestContext context) @@ -306,7 +306,7 @@ HttpSession session = request.getSession(false); if (session != null) lang = (String) session.getAttribute(attrName); - return (lang != null) ? new Locale(lang) : null; + return (lang != null) ? LocaleContextInfo.getLocale(lang) : null; } private void saveLocale(PortalRequestContext context, Locale loc) @@ -336,7 +336,7 @@ if (log.isWarnEnabled()) log.warn("Locale changed to unsupported Locale during request processing: " + loc); return; - } + } // we presume PortalRequestContext, and UIPortalApplication ((UIPortalApplication) context.getUIApplication()).setOrientation(localeConfig.getOrientation()); } @@ -379,7 +379,7 @@ UserProfile userProfile = loadUserProfile(container, context); if (userProfile != null) { - userProfile.getUserInfoMap().put(Constants.USER_LANGUAGE, loc.getLanguage()); + userProfile.getUserInfoMap().put(Constants.USER_LANGUAGE, LocaleContextInfo.getLocaleAsString(loc)); try { svc.getUserProfileHandler().saveUserProfile(userProfile, false);

13 years, 10 months

1
0
0 / 0

gatein SVN: r3974 - in components/shindig/trunk: features and 6 other directories.

by do-not-reply＠jboss.org

Author: thomas.heute(a)jboss.com Date: 2010-08-31 03:41:49 -0400 (Tue, 31 Aug 2010) New Revision: 3974 Modified: components/shindig/trunk/features/pom.xml components/shindig/trunk/java/common/pom.xml components/shindig/trunk/java/gadgets/pom.xml components/shindig/trunk/java/pom.xml components/shindig/trunk/java/samples/pom.xml components/shindig/trunk/java/server/pom.xml components/shindig/trunk/java/social-api/pom.xml components/shindig/trunk/pom.xml Log: Prepare for Patch03 release Modified: components/shindig/trunk/features/pom.xml =================================================================== --- components/shindig/trunk/features/pom.xml 2010-08-31 07:10:59 UTC (rev 3973) +++ components/shindig/trunk/features/pom.xml 2010-08-31 07:41:49 UTC (rev 3974) @@ -23,7 +23,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version>1.0-r790473-Patch03-SNAPSHOT</version> + <version>1.0-r790473-Patch03</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/java/common/pom.xml =================================================================== --- components/shindig/trunk/java/common/pom.xml 2010-08-31 07:10:59 UTC (rev 3973) +++ components/shindig/trunk/java/common/pom.xml 2010-08-31 07:41:49 UTC (rev 3974) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch03-SNAPSHOT</version> + <version>1.0-r790473-Patch03</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/java/gadgets/pom.xml =================================================================== --- components/shindig/trunk/java/gadgets/pom.xml 2010-08-31 07:10:59 UTC (rev 3973) +++ components/shindig/trunk/java/gadgets/pom.xml 2010-08-31 07:41:49 UTC (rev 3974) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch03-SNAPSHOT</version> + <version>1.0-r790473-Patch03</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/java/pom.xml =================================================================== --- components/shindig/trunk/java/pom.xml 2010-08-31 07:10:59 UTC (rev 3973) +++ components/shindig/trunk/java/pom.xml 2010-08-31 07:41:49 UTC (rev 3974) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version>1.0-r790473-Patch03-SNAPSHOT</version> + <version>1.0-r790473-Patch03</version> </parent> <artifactId>shindig-parent</artifactId> Modified: components/shindig/trunk/java/samples/pom.xml =================================================================== --- components/shindig/trunk/java/samples/pom.xml 2010-08-31 07:10:59 UTC (rev 3973) +++ components/shindig/trunk/java/samples/pom.xml 2010-08-31 07:41:49 UTC (rev 3974) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch03-SNAPSHOT</version> + <version>1.0-r790473-Patch03</version> </parent> <artifactId>shindig-samples</artifactId> Modified: components/shindig/trunk/java/server/pom.xml =================================================================== --- components/shindig/trunk/java/server/pom.xml 2010-08-31 07:10:59 UTC (rev 3973) +++ components/shindig/trunk/java/server/pom.xml 2010-08-31 07:41:49 UTC (rev 3974) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch03-SNAPSHOT</version> + <version>1.0-r790473-Patch03</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/java/social-api/pom.xml =================================================================== --- components/shindig/trunk/java/social-api/pom.xml 2010-08-31 07:10:59 UTC (rev 3973) +++ components/shindig/trunk/java/social-api/pom.xml 2010-08-31 07:41:49 UTC (rev 3974) @@ -22,7 +22,7 @@ <parent> <groupId>org.gatein.shindig</groupId> <artifactId>shindig-parent</artifactId> - <version>1.0-r790473-Patch03-SNAPSHOT</version> + <version>1.0-r790473-Patch03</version> <relativePath>../pom.xml</relativePath> </parent> Modified: components/shindig/trunk/pom.xml =================================================================== --- components/shindig/trunk/pom.xml 2010-08-31 07:10:59 UTC (rev 3973) +++ components/shindig/trunk/pom.xml 2010-08-31 07:41:49 UTC (rev 3974) @@ -28,7 +28,7 @@ <groupId>org.gatein.shindig</groupId> <artifactId>shindig-project</artifactId> - <version>1.0-r790473-Patch03-SNAPSHOT</version> + <version>1.0-r790473-Patch03</version> <packaging>pom</packaging> <name>Apache Shindig Project</name>

13 years, 10 months

1
0
0 / 0

gatein SVN: r3973 - in portal/branches/branched-r3845: component/identity/src/test/java and 5 other directories.

by do-not-reply＠jboss.org

Author: kien_nguyen Date: 2010-08-31 03:10:59 -0400 (Tue, 31 Aug 2010) New Revision: 3973 Removed: portal/branches/branched-r3845/component/application-registry/src/test/java/conf/ portal/branches/branched-r3845/component/identity/src/test/java/conf/ portal/branches/branched-r3845/component/resources/src/test/java/locale/ portal/branches/branched-r3845/component/web/api/src/test/java/conf/ portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_0.xml portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_1.xml portal/branches/branched-r3845/webui/core/src/test/java/conf/ portal/branches/branched-r3845/webui/core/src/test/java/org/exoplatform/webui/core/ Log: GTNPORTAL-113 resources have to be in src/[main|test]/resources and not in src/[main|test]/java (Missing delete some files) Deleted: portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_0-with-skin-module.xml =================================================================== Deleted: portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_0.xml =================================================================== Deleted: portal/branches/branched-r3845/component/web/resources/src/test/java/org/exoplatform/portal/resource/gatein-resources-1_1.xml ===================================================================

13 years, 10 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

gatein-commits August 2010