JBoss Portal SVN: r6395 - in trunk: core-admin and 1 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-02-24 20:11:40 -0500 (Sat, 24 Feb 2007)
New Revision: 6395
Modified:
trunk/core-admin/build.xml
trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml
trunk/core/build.xml
Log:
package facelets & co in jboss-portal.sar rather than in portal-admin.sar
Modified: trunk/core/build.xml
===================================================================
--- trunk/core/build.xml 2007-02-25 01:07:09 UTC (rev 6394)
+++ trunk/core/build.xml 2007-02-25 01:11:40 UTC (rev 6395)
@@ -338,6 +338,12 @@
<fileset dir="${apache.fileupload.lib}" includes="commons-fileupload.jar"/>
<fileset dir="${jakarta.io.lib}" includes="commons-io.jar"/>
<fileset dir="${portals.bridges.lib}" includes="portals-bridges-common.jar"/>
+
+ <!-- For JSF -->
+ <fileset dir="../core-admin/src/etc/sun-jsf" includes="jsf-example.jar"/>
+ <fileset dir="${apache.lang.lib}" includes="commons-lang-2.0.jar"/>
+ <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/>
+ <fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/>
</copy>
</target>
Modified: trunk/core-admin/build.xml
===================================================================
--- trunk/core-admin/build.xml 2007-02-25 01:07:09 UTC (rev 6394)
+++ trunk/core-admin/build.xml 2007-02-25 01:11:40 UTC (rev 6395)
@@ -196,11 +196,7 @@
</copy>
<copy todir="${build.resources}/portal-admin.sar/lib">
<fileset dir="${build.lib}" includes="portal-core-admin-lib.jar"/>
- <fileset dir="${facelets.facelets.lib}" includes="jsf-facelets.jar"/>
<fileset dir="${apache.tomahawk.lib}" includes="tomahawk.jar"/>
- <fileset dir="${source.etc}/sun-jsf" includes="jsf-example.jar"/>
- <fileset dir="${apache.lang.lib}" includes="commons-lang-2.0.jar"/>
- <fileset dir="${el.el.lib}" includes="el-api.jar,el-ri.jar"/>
</copy>
<copy todir="${build.resources}/portal-admin.sar/portal-admin.war">
<fileset dir="${build.resources}/portal-admin-war"/>
Modified: trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml 2007-02-25 01:07:09 UTC (rev 6394)
+++ trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml 2007-02-25 01:11:40 UTC (rev 6395)
@@ -17,7 +17,7 @@
<h:panelGroup rendered="#{instance != null}">
<h:outputText value="#{instance.id}"/>
<h:panelGroup rendered="#{portlet != null}">
- <h:outputText value="there is a portlet"/>
+ <h:outputText value="Portlet #{portlet.name} - #{portlet.description}"/>
</h:panelGroup>
</h:panelGroup>
</pfc:context>
19 years, 2 months
- 1
- 0
JBoss Portal SVN: r6394 - in trunk/wsrp: src/main/org/jboss/portal/wsrp/deployment and 5 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-02-24 20:07:09 -0500 (Sat, 24 Feb 2007)
New Revision: 6394
Added:
trunk/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml
Removed:
trunk/wsrp/src/resources/jboss-portal-wsrp.dtd
Modified:
trunk/wsrp/build.xml
trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java
trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml
trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsp/consumers/consumer.jsp
Log:
- Added setter and getter for EntityResolver on WSRPDeployerMBean to fix deployment issue.
- Activated DB-backed code on ConsumersRegistryService (will still require some major work).
- Use AOP to add transaction support on ConsumersRegistryService.startService method.
- Added means to see registration context on registered clients in GUI.
- Removed old dtd.
Modified: trunk/wsrp/build.xml
===================================================================
--- trunk/wsrp/build.xml 2007-02-25 00:58:24 UTC (rev 6393)
+++ trunk/wsrp/build.xml 2007-02-25 01:07:09 UTC (rev 6394)
@@ -161,10 +161,20 @@
<path refid="jboss.serialization.classpath"/>
</path>
+ <path id="aop.classpath">
+ <pathelement path="${jbossas/core.libs.lib}/jboss-aspect-library.jar"/>
+ <pathelement path="${jboss.aop.lib}/jboss-aop.jar"/>
+ <path refid="javassist.javassist.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="trove.trove.classpath"/>
+ <path refid="qdox.qdox.classpath"/>
+ </path>
+
<!-- Configure defaults & build tools -->
<call target="configure-defaults"/>
<call target="configure-tools"/>
<call target="configure-explode"/>
+ <call target="configure-jbossaop"/>
<!--+=======================================+-->
<!--| Define module specific elements here. |-->
@@ -180,6 +190,20 @@
<property name="build.lib.test" value="${build.lib}/tests"/>
</target>
+ <target name="configure-jbossaop">
+ <path id="jbossaop.task.classpath">
+ <path refid="jboss.aop.classpath"/>
+ <path refid="javassist.javassist.classpath"/>
+ <path refid="oswego.concurrent.classpath"/>
+ <path refid="trove.trove.classpath"/>
+ <path refid="qdox.qdox.classpath"/>
+ </path>
+ <taskdef
+ name="aopc"
+ classname="org.jboss.aop.ant.AopC"
+ classpathref="jbossaop.task.classpath"/>
+ </target>
+
<target name="configure-explode">
<path id="explode.task.classpath">
<pathelement location="${project.tools}/lib/explode.jar"/>
@@ -217,6 +241,20 @@
</copy>
<mkdir dir="${build.lib.test}"/>
<mkdir dir="${build.resources.test}"/>
+
+ <path id="bilto">
+ <path refid="jbossas/core.libs.classpath"/>
+ <path refid="dependentmodule.classpath"/>
+ <pathelement path="${build.classes}"/>
+ </path>
+
+ <aopc compilerclasspathref="aop.classpath" verbose="true">
+ <classpath refid="bilto"/>
+ <src path="${build.classes}"/>
+ <aoppath path="${build.resources}/portal-wsrp-sar/wsrp-aop.xml"/>
+ <include name="org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.class"/>
+ </aopc>
+
<property name="compile.disable" value="true"/>
</target>
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java 2007-02-25 00:58:24 UTC (rev 6393)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployerMBean.java 2007-02-25 01:07:09 UTC (rev 6394)
@@ -24,6 +24,7 @@
import org.jboss.deployment.SubDeployerExtMBean;
import org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistry;
+import org.xml.sax.EntityResolver;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
@@ -38,4 +39,8 @@
ConsumersRegistry getConsumerRegistry();
void setConsumerRegistry(ConsumersRegistry consumerRegistry);
+
+ EntityResolver getEntityResolver();
+
+ void setEntityResolver(EntityResolver entityResolver);
}
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java 2007-02-25 00:58:24 UTC (rev 6393)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/portlet/consumers/ConsumersRegistryService.java 2007-02-25 01:07:09 UTC (rev 6394)
@@ -23,20 +23,22 @@
package org.jboss.portal.wsrp.portlet.consumers;
+import org.hibernate.Session;
import org.hibernate.SessionFactory;
import org.jboss.portal.common.util.ParameterValidation;
import org.jboss.portal.jems.as.system.AbstractJBossService;
-import org.jboss.portal.portlet.PortletInvoker;
-import org.jboss.portal.portlet.federation.FederatedPortletInvoker;
import org.jboss.portal.portlet.federation.FederatingPortletInvoker;
import org.jboss.portal.wsrp.WSRPConsumer;
+import org.jboss.portal.wsrp.consumer.ProducerInfo;
+import org.jboss.portal.wsrp.consumer.WSRPConsumerImpl;
+import org.jboss.portal.wsrp.deployment.WSRPConsumerService;
-import java.util.ArrayList;
+import javax.naming.InitialContext;
import java.util.Collection;
import java.util.Collections;
import java.util.Iterator;
-import java.util.List;
import java.util.SortedMap;
+import java.util.TreeMap;
/**
* @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
@@ -74,7 +76,7 @@
this.sessionFactoryJNDIName = sessionFactoryJNDIName;
}
- /*protected void startService() throws Exception
+ protected void startService() throws Exception
{
sessionFactory = (SessionFactory)new InitialContext().lookup(sessionFactoryJNDIName);
@@ -90,7 +92,7 @@
consumer = new WSRPConsumerImpl();
consumer.setProducerInfo(producerInfo);
consumers.put(producerInfo.getId(), consumer);
- if(producerInfo.isActive())
+ if (producerInfo.isActive())
{
WSRPConsumerService service = new WSRPConsumerService();
service.setConsumer(consumer);
@@ -105,53 +107,53 @@
sessionFactory = null;
consumers.clear();
consumers = null;
- }*/
+ }
public Collection getConfiguredConsumers()
{
-// return Collections.unmodifiableCollection(consumers.values());
- Collection invokers = federatingPortletInvoker.getFederatedInvokers();
- if (invokers.isEmpty())
- {
- return Collections.EMPTY_LIST;
- }
-
- List result = new ArrayList(invokers.size());
- for (Iterator invokersIt = invokers.iterator(); invokersIt.hasNext();)
- {
- WSRPConsumer consumer = getConsumerFrom((FederatedPortletInvoker)invokersIt.next());
-
- if (consumer != null)
- {
- result.add(consumer);
- }
- }
-
- return result;
+ return Collections.unmodifiableCollection(consumers.values());
}
public WSRPConsumer getConsumer(String id)
{
ParameterValidation.throwIllegalArgExceptionIfNullOrEmpty(id, "consumer id", null);
- // return (WSRPConsumer) consumers.get(id);
- return getConsumerFrom(federatingPortletInvoker.getFederatedInvoker(id));
- }
+ return (WSRPConsumer)consumers.get(id);
- private WSRPConsumer getConsumerFrom(FederatedPortletInvoker service)
- {
- if (service == null)
- {
- return null;
- }
+ /*// first check if this consumer has already been loaded
+ WSRPConsumer wsrpConsumer = (WSRPConsumer)consumers.get(id);
- PortletInvoker invoker = service.getPortletInvoker();
- if (invoker instanceof WSRPConsumer)
+ if(wsrpConsumer != null)
{
- return (WSRPConsumer)invoker;
+ return wsrpConsumer;
}
else
{
+ Session session = sessionFactory.getCurrentSession();
+ Query query = session.createQuery("from ProducerInfo where id=:id");
+ query.setString("id", id);
+ ProducerInfo pi = (ProducerInfo)query.uniqueResult();
+ if (pi != null)
+ {
+ wsrpConsumer = new WSRPConsumerImpl();
+ wsrpConsumer.setProducerInfo(pi);
+ consumers.put(pi.getId(), wsrpConsumer);
+ if (pi.isActive())
+ {
+ WSRPConsumerService service = new WSRPConsumerService();
+ service.setConsumer(wsrpConsumer);
+ service.setFederatingPortletInvoker(federatingPortletInvoker);
+ try
+ {
+ service.start();
+ }
+ catch (Exception e)
+ {
+ throw new RuntimeException("Couldn't start Consumer '" + pi.getId() + "'", e);
+ }
+ }
+ return wsrpConsumer;
+ }
return null;
- }
+ }*/
}
}
Deleted: trunk/wsrp/src/resources/jboss-portal-wsrp.dtd
===================================================================
--- trunk/wsrp/src/resources/jboss-portal-wsrp.dtd 2007-02-25 00:58:24 UTC (rev 6393)
+++ trunk/wsrp/src/resources/jboss-portal-wsrp.dtd 2007-02-25 01:07:09 UTC (rev 6394)
@@ -1,85 +0,0 @@
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
- ~ contributors as indicated by the @authors tag. See the ~
- ~ copyright.txt in the distribution for a full listing of ~
- ~ individual contributors. ~
- ~ ~
- ~ This is free software; you can redistribute it and/or modify it ~
- ~ under the terms of the GNU Lesser General Public License as ~
- ~ published by the Free Software Foundation; either version 2.1 of ~
- ~ the License, or (at your option) any later version. ~
- ~ ~
- ~ This software is distributed in the hope that it will be useful, ~
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
- ~ Lesser General Public License for more details. ~
- ~ ~
- ~ You should have received a copy of the GNU Lesser General Public ~
- ~ License along with this software; if not, write to the Free ~
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<!--
-JBoss Portal's WSRP Remote Producer Configuration deployment descriptor for the *-wsrp.xml files used by Portal to be
-able to consume WSRP portlets exposed by a remote producer.
-author: <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
-version: 1.0 (Portal 2.4)
-revision: $Revision$
--->
-
-<!-- The root element. Contains deployment elements. -->
-<!ELEMENT deployments ( deployment* )>
-
-<!-- Deployment related information. As of 1.0 (Portal 2.4), the only deployment information relates to WSRP producers. -->
-<!ELEMENT deployment ( wsrp-producer )>
-
-<!-- The WSRP producer information. -->
-<!ELEMENT wsrp-producer ( producer-id, expiration-cache?, ( endpoint-config | endpoint-wsdl-url ), registration-data? )>
-
-<!-- The producer identifier. This should be unique for a given Portal deployment. The identifier is used to
-identify the portlet provider in the management interface. -->
-<!ELEMENT producer-id ( #PCDATA )>
-
-<!-- The period of producer information (such as list of offered portlets) cache refreshing in seconds. -->
-<!ELEMENT expiration-cache ( #PCDATA )>
-
-<!-- WSRP endpoints configuration information by interface URL. Mutually exclusive with endpoint-wsdl-url. -->
-<!ELEMENT endpoint-config ( service-description-url, markup-url, registration-url?, portlet-management-url? )>
-
-<!-- The URL for the service description interface endpoint on the remote producer. -->
-<!ELEMENT service-description-url ( #PCDATA )>
-
-<!-- The URL for the markup interface endpoint on the remote producer. -->
-<!ELEMENT markup-url ( #PCDATA )>
-
-<!-- The URL for the optional portlet management interface endpoint on the remote producer. -->
-<!ELEMENT portlet-management-url ( #PCDATA )>
-
-<!-- The URL for the optional registration interface endpoint on the remote producer. -->
-<!ELEMENT registration-url ( #PCDATA )>
-
-<!-- The URL of the WSDL description of the producer's WSRP services. Mutally exclusive with endpoint-config. -->
-<!ELEMENT endpoint-wsdl-url ( #PCDATA )>
-
-<!-- Container for registration information. -->
-<!ELEMENT registration-data ( consumer-name?, property* )>
-
-<!--
-An optional name (preferably unique) that identifies the Consumer. An example of such a name would be the Consumer's URL.
-If no consumer-name is provided, one will be automatically generated by JBoss Portal.
--->
-<!ELEMENT consumer-name ( #PCDATA )>
-
-<!-- A registration property. -->
-<!ELEMENT property ( name, lang, value )>
-
-<!-- The name of the property. -->
-<!ELEMENT name ( #PCDATA )>
-
-<!-- The language the property is in. -->
-<!ELEMENT lang ( #PCDATA )>
-
-<!-- The value of the property. -->
-<!ELEMENT value ( #PCDATA )>
\ No newline at end of file
Modified: trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2007-02-25 00:58:24 UTC (rev 6393)
+++ trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2007-02-25 01:07:09 UTC (rev 6394)
@@ -148,7 +148,7 @@
<attribute name="JNDIName">java:/portal/WSRPConsumerSessionFactory</attribute>
</mbean>
- <!-- Consumers registry for WSRP consumer configuration portlet -->
+ <!-- Consumers registry for WSRP consumers -->
<mbean code="org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistryService"
name="portal.wsrp:service=ConsumersRegistry"
xmbean-dd="" xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
Added: trunk/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml (rev 0)
+++ trunk/wsrp/src/resources/portal-wsrp-sar/wsrp-aop.xml 2007-02-25 01:07:09 UTC (rev 6394)
@@ -0,0 +1,64 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<aop>
+ <metadata tag="transaction" class="org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistryService">
+ <method name="startService">
+ <trans-attribute>Required</trans-attribute>
+ </method>
+ </metadata>
+
+ <!-- TRANSACTIONS -->
+ <interceptor class="org.jboss.aspects.tx.TxPropagationInterceptor" scope="PER_VM"/>
+ <interceptor factory="org.jboss.aspects.tx.TxInterceptorFactory" scope="PER_CLASS_JOINPOINT"/>
+
+ <bind pointcut="all(@transaction)">
+ <interceptor-ref name="org.jboss.aspects.tx.TxInterceptorFactory"/>
+ </bind>
+
+ <interceptor name="class-txsynchronized" factory="org.jboss.aspects.txlock.TxLockInterceptorFactory"
+ scope="PER_CLASS"/>
+ <interceptor name="instance-txsynchronized" factory="org.jboss.aspects.txlock.TxLockInterceptorFactory"
+ scope="PER_INSTANCE"/>
+
+ <bind pointcut="execution(static * *->@TxSynchronized(..)) OR execution(*->@TxSynchronized(..))">
+ <interceptor-ref name="class-txsynchronized"/>
+ </bind>
+
+ <bind pointcut="execution(!static * *->@TxSynchronized(..))">
+ <interceptor-ref name="instance-txsynchronized"/>
+ </bind>
+
+ <bind pointcut="all((a)org.jboss.aspects.tx.Tx)">
+ <interceptor-ref name="org.jboss.aspects.tx.TxInterceptorFactory"/>
+ </bind>
+
+ <bind
+ pointcut="execution(static * *->@org.jboss.aspects.txlock.TxSynchronized(..)) OR execution(*->@org.jboss.aspects.txlock.TxSynchronized(..))">
+ <interceptor-ref name="class-txsynchronized"/>
+ </bind>
+
+ <bind pointcut="execution(!static * *->@org.jboss.aspects.txlock.TxSynchronized(..))">
+ <interceptor-ref name="instance-txsynchronized"/>
+ </bind>
+</aop>
\ No newline at end of file
Modified: trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsp/consumers/consumer.jsp
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsp/consumers/consumer.jsp 2007-02-25 00:58:24 UTC (rev 6393)
+++ trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jsp/consumers/consumer.jsp 2007-02-25 01:07:09 UTC (rev 6394)
@@ -144,7 +144,19 @@
%>
</td>
</tr>
+<%
+ if (regInfo.isRegistrationValid())
+ {
+%>
<tr>
+ <th>Registration context:</th>
+ <td>Handle: <%=regInfo.getRegistrationContext().getRegistrationHandle()%>
+ </td>
+</tr>
+<%
+ }
+%>
+<tr>
<td colspan="2">
<input type="submit" name="editConsumer" value="Save" class="portlet-form-button"/>
<a href="<portlet:renderURL>
19 years, 2 months
- 1
- 0
JBoss Portal SVN: r6393 - in trunk: core-admin/src/resources/portal-admin-war/META-INF and 5 other directories.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-02-24 19:58:24 -0500 (Sat, 24 Feb 2007)
New Revision: 6393
Added:
trunk/faces/src/main/org/jboss/portal/faces/facelet/
trunk/faces/src/main/org/jboss/portal/faces/facelet/ContextTagHandler.java
trunk/faces/src/resources/portal-faces-lib-jar/META-INF/
trunk/faces/src/resources/portal-faces-lib-jar/META-INF/portal.taglib.xml
Removed:
trunk/faces/src/resources/portal-faces-lib-jar/composite.tld
Modified:
trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml
trunk/core-admin/src/resources/portal-admin-war/META-INF/content.taglib.xml
trunk/faces/build.xml
Log:
added a facelet tag handler called "context" that allows to create an aliasing context pretty much like an ui:include that would operate on the nested markup directly.
Modified: trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml 2007-02-25 00:18:12 UTC (rev 6392)
+++ trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml 2007-02-25 00:58:24 UTC (rev 6393)
@@ -2,16 +2,25 @@
xmlns="http://www.w3.org/1999/xhtml"
xmlns:ui="http://java.sun.com/jsf/facelets"
xmlns:h="http://java.sun.com/jsf/html"
- xmlns:f="http://java.sun.com/jsf/core">
+ xmlns:f="http://java.sun.com/jsf/core"
+ xmlns:ct="http://www.julien.com"
+ xmlns:pfc="http://www.jboss.com/portal/facelet/common">
<h:selectOneListbox
value="#{contentURI}">
<f:selectItems value="#{registry.editors.portlet.instanceItems}"/>
</h:selectOneListbox>
- <h:panelGroup rendered="#{registry.editors.portlet.instanceMap[contentURI] != null}">
- <h:outputText value="#{registry.editors.portlet.instanceMap[contentURI].id}"/>
- </h:panelGroup>
+ <pfc:context>
+ <ui:param name="instance" value="#{registry.editors.portlet.instanceMap[contentURI]}"/>
+ <ui:param name="portlet" value="#{instance.portlet}"/>
+ <h:panelGroup rendered="#{instance != null}">
+ <h:outputText value="#{instance.id}"/>
+ <h:panelGroup rendered="#{portlet != null}">
+ <h:outputText value="there is a portlet"/>
+ </h:panelGroup>
+ </h:panelGroup>
+ </pfc:context>
<h:commandButton value="Show details"/>
Modified: trunk/core-admin/src/resources/portal-admin-war/META-INF/content.taglib.xml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-war/META-INF/content.taglib.xml 2007-02-25 00:18:12 UTC (rev 6392)
+++ trunk/core-admin/src/resources/portal-admin-war/META-INF/content.taglib.xml 2007-02-25 00:58:24 UTC (rev 6393)
@@ -7,4 +7,8 @@
<tag-name>content</tag-name>
<handler-class>org.jboss.portal.core.portlet.management.content.ContentEditorTagHandler</handler-class>
</tag>
+ <tag>
+ <tag-name>context</tag-name>
+ <handler-class>org.jboss.portal.faces.facelet.ContextTagHandler</handler-class>
+ </tag>
</facelet-taglib>
\ No newline at end of file
Modified: trunk/faces/build.xml
===================================================================
--- trunk/faces/build.xml 2007-02-25 00:18:12 UTC (rev 6392)
+++ trunk/faces/build.xml 2007-02-25 00:58:24 UTC (rev 6393)
@@ -90,6 +90,8 @@
<path id="library.classpath">
<path refid="sun.servlet.classpath"/>
<path refid="apache.myfaces.classpath"/>
+ <path refid="facelets.facelets.classpath"/>
+ <path refid="el.el.classpath"/>
<path refid="apache.log4j.classpath"/>
</path>
Added: trunk/faces/src/main/org/jboss/portal/faces/facelet/ContextTagHandler.java
===================================================================
--- trunk/faces/src/main/org/jboss/portal/faces/facelet/ContextTagHandler.java (rev 0)
+++ trunk/faces/src/main/org/jboss/portal/faces/facelet/ContextTagHandler.java 2007-02-25 00:58:24 UTC (rev 6393)
@@ -0,0 +1,64 @@
+/******************************************************************************
+ * JBoss, a division of Red Hat *
+ * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * contributors as indicated by the @authors tag. See the *
+ * copyright.txt in the distribution for a full listing of *
+ * individual contributors. *
+ * *
+ * This is free software; you can redistribute it and/or modify it *
+ * under the terms of the GNU Lesser General Public License as *
+ * published by the Free Software Foundation; either version 2.1 of *
+ * the License, or (at your option) any later version. *
+ * *
+ * This software is distributed in the hope that it will be useful, *
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of *
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU *
+ * Lesser General Public License for more details. *
+ * *
+ * You should have received a copy of the GNU Lesser General Public *
+ * License along with this software; if not, write to the Free *
+ * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA *
+ * 02110-1301 USA, or see the FSF site: http://www.fsf.org. *
+ ******************************************************************************/
+package org.jboss.portal.faces.facelet;
+
+import com.sun.facelets.tag.TagHandler;
+import com.sun.facelets.tag.TagConfig;
+import com.sun.facelets.FaceletContext;
+import com.sun.facelets.FaceletException;
+
+import javax.faces.component.UIComponent;
+import javax.faces.FacesException;
+import javax.el.ELException;
+import javax.el.VariableMapper;
+import java.io.IOException;
+
+/**
+ * Defines a context tag which allow to create use the ui:param tag without requiring to include
+ * content. It can be seen as an immediate ui:include facility which allow to define aliases
+ * for the nested content of the tag.
+ *
+ * @author <a href="mailto:julien@jboss.org">Julien Viet</a>
+ * @version $Revision: 1.1 $
+ */
+public class ContextTagHandler extends TagHandler
+{
+
+ public ContextTagHandler(TagConfig tagConfig)
+ {
+ super(tagConfig);
+ }
+
+ public void apply(FaceletContext ctx, UIComponent parent) throws IOException, FacesException, FaceletException, ELException
+ {
+ VariableMapper orig = ctx.getVariableMapper();
+ try
+ {
+ this.nextHandler.apply(ctx, parent);
+ }
+ finally
+ {
+ ctx.setVariableMapper(orig);
+ }
+ }
+}
Added: trunk/faces/src/resources/portal-faces-lib-jar/META-INF/portal.taglib.xml
===================================================================
--- trunk/faces/src/resources/portal-faces-lib-jar/META-INF/portal.taglib.xml (rev 0)
+++ trunk/faces/src/resources/portal-faces-lib-jar/META-INF/portal.taglib.xml 2007-02-25 00:58:24 UTC (rev 6393)
@@ -0,0 +1,10 @@
+<!DOCTYPE facelet-taglib PUBLIC
+ "-//Sun Microsystems, Inc.//DTD Facelet Taglib 1.0//EN"
+ "http://java.sun.com/dtd/facelet-taglib_1_0.dtd">
+<facelet-taglib>
+ <namespace>http://www.jboss.com/portal/facelet/common</namespace>
+ <tag>
+ <tag-name>context</tag-name>
+ <handler-class>org.jboss.portal.faces.facelet.ContextTagHandler</handler-class>
+ </tag>
+</facelet-taglib>
\ No newline at end of file
Deleted: trunk/faces/src/resources/portal-faces-lib-jar/composite.tld
===================================================================
--- trunk/faces/src/resources/portal-faces-lib-jar/composite.tld 2007-02-25 00:18:12 UTC (rev 6392)
+++ trunk/faces/src/resources/portal-faces-lib-jar/composite.tld 2007-02-25 00:58:24 UTC (rev 6393)
@@ -1,44 +0,0 @@
-<?xml version="1.0"?>
-<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- ~ JBoss, a division of Red Hat ~
- ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
- ~ contributors as indicated by the @authors tag. See the ~
- ~ copyright.txt in the distribution for a full listing of ~
- ~ individual contributors. ~
- ~ ~
- ~ This is free software; you can redistribute it and/or modify it ~
- ~ under the terms of the GNU Lesser General Public License as ~
- ~ published by the Free Software Foundation; either version 2.1 of ~
- ~ the License, or (at your option) any later version. ~
- ~ ~
- ~ This software is distributed in the hope that it will be useful, ~
- ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
- ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
- ~ Lesser General Public License for more details. ~
- ~ ~
- ~ You should have received a copy of the GNU Lesser General Public ~
- ~ License along with this software; if not, write to the Free ~
- ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
- ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
- ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
-<taglib>
- <tlib-version>0.03</tlib-version>
- <jsp-version>2.0</jsp-version>
- <short-name>composite</short-name>
- <uri>http://www.jboss.org/jsf/component/tags</uri>
- <description></description>
- <tag>
- <name>composite</name>
- <tag-class>org.jboss.portal.faces.composite.CompositeTag</tag-class>
- <attribute>
- <name>id</name>
- <description></description>
- </attribute>
- <attribute>
- <name>type</name>
- <description></description>
- </attribute>
- <dynamic-attributes>true</dynamic-attributes>
- </tag>
-</taglib>
19 years, 2 months
- 1
- 0
JBoss Portal SVN: r6392 - in trunk/core-admin/src: resources/portal-admin-sar/content and 1 other directory.
by portal-commits＠lists.jboss.org
Author: julien(a)jboss.com
Date: 2007-02-24 19:18:12 -0500 (Sat, 24 Feb 2007)
New Revision: 6392
Modified:
trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/content/ContentEditorTagHandler.java
trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/content/PortletContentEditor.java
trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml
Log:
improve a bit the instance editor
Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/content/ContentEditorTagHandler.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/content/ContentEditorTagHandler.java 2007-02-24 19:12:20 UTC (rev 6391)
+++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/content/ContentEditorTagHandler.java 2007-02-25 00:18:12 UTC (rev 6392)
@@ -27,7 +27,6 @@
import com.sun.facelets.tag.TagAttribute;
import com.sun.facelets.FaceletContext;
import com.sun.facelets.FaceletException;
-import com.sun.facelets.el.VariableMapperWrapper;
import javax.faces.component.UIComponent;
import javax.faces.FacesException;
@@ -35,7 +34,6 @@
import javax.el.ValueExpression;
import javax.el.ExpressionFactory;
import javax.el.VariableMapper;
-import javax.el.ELContext;
import java.io.IOException;
import java.net.URL;
@@ -66,6 +64,11 @@
this.contentType = this.getRequiredAttribute("contentType");
}
+ public static String getContentURI()
+ {
+ return null;
+ }
+
public ContentEditorRegistry getRegistry()
{
return registry;
@@ -97,27 +100,28 @@
// Only perform inclusion if content type is not null
if (editor != null)
{
-
// Get editor URL
URL url = editor.getFaceletURL();
+ //
+ VariableMapper variableMapper = ctx.getVariableMapper();
+ ValueExpression previousContentURIVE = variableMapper.resolveVariable(contentURI.getLocalName());
+
// Do the include stuff
- VariableMapper orig = ctx.getVariableMapper();
- ctx.setVariableMapper(new VariableMapperWrapper(orig));
try
{
nextHandler.apply(ctx, null);
//
ValueExpression valueVE = contentURI.getValueExpression(ctx, Object.class);
- ctx.getVariableMapper().setVariable(contentURI.getLocalName(), valueVE);
+ variableMapper.setVariable(contentURI.getLocalName(), valueVE);
//
ctx.includeFacelet(parent, url);
}
finally
{
- ctx.setVariableMapper(orig);
+ variableMapper.setVariable(contentURI.getLocalName(), previousContentURIVE);
}
}
}
Modified: trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/content/PortletContentEditor.java
===================================================================
--- trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/content/PortletContentEditor.java 2007-02-24 19:12:20 UTC (rev 6391)
+++ trunk/core-admin/src/main/org/jboss/portal/core/portlet/management/content/PortletContentEditor.java 2007-02-25 00:18:12 UTC (rev 6392)
@@ -24,13 +24,29 @@
import org.jboss.portal.core.model.instance.InstanceContainer;
import org.jboss.portal.core.model.instance.InstanceDefinition;
+import org.jboss.portal.core.model.instance.Instance;
+import org.jboss.portal.portlet.Portlet;
+import org.jboss.portal.portlet.info.PortletInfo;
+import org.jboss.portal.portlet.info.MetaInfo;
import javax.faces.model.SelectItem;
+import javax.faces.context.FacesContext;
+import javax.faces.application.Application;
+import javax.faces.el.VariableResolver;
+import javax.faces.el.PropertyResolver;
+import javax.faces.el.ValueBinding;
+import javax.el.ExpressionFactory;
+import javax.el.ELContext;
+import javax.el.ValueExpression;
import java.util.List;
import java.util.ArrayList;
import java.util.Collection;
import java.util.Iterator;
+import java.util.Map;
+import java.util.HashMap;
+import com.sun.facelets.el.ELAdaptor;
+
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
* @version $Revision: 1.1 $
@@ -51,7 +67,7 @@
this.instanceContainer = instanceContainer;
}
- public List getInstances()
+ public List getInstanceItems()
{
Collection definitions = instanceContainer.getDefinitions();
List items = new ArrayList(definitions.size());
@@ -66,4 +82,70 @@
}
return items;
}
+
+ public Map getInstanceMap()
+ {
+ Collection definitions = instanceContainer.getDefinitions();
+ Map map = new HashMap(definitions.size());
+ for (Iterator i = definitions.iterator();i.hasNext();)
+ {
+ InstanceDefinition def = (InstanceDefinition)i.next();
+ map.put(def.getId(), def);
+ }
+ return map;
+ }
+
+ public Instance getSelectedInstance()
+ {
+ try
+ {
+// Class clazz = Thread.currentThread().getContextClassLoader().loadClass("com.sun.el.ExpressionFactoryImpl");
+// ExpressionFactory factory = (ExpressionFactory)clazz.newInstance();
+// ELContext ctx = ELAdaptor.getELContext(FacesContext.getCurrentInstance());
+//
+// ValueExpression ve = ctx.getVariableMapper().resolveVariable("contentURI");
+// System.out.println("ve = " + ve);
+// Object o = ve.getValue(ctx);
+// System.out.println("o = " + o);
+// System.out.println("o = " + o);
+ }
+ catch (Exception e)
+ {
+ e.printStackTrace();
+ }
+
+// FacesContext ctx = FacesContext.getCurrentInstance();
+// Application app = ctx.getApplication();
+// ValueBinding vb = app.createValueBinding("#{contentURI}");
+// String contentURI = (String)vb.getValue(ctx);
+//// System.out.println("vb.getExpressionString() = " + vb.getExpressionString());
+//// System.out.println("vb.getExpressionString() = " + vb.getExpressionString());
+//// System.out.println("vb.getExpressionString() = " + vb.getExpressionString());
+// System.out.println("contentURI = " + contentURI);
+// System.out.println("contentURI = " + contentURI);
+// System.out.println("contentURI = " + contentURI);
+
+
+ return null;
+ }
+
+// public List getKeywords()
+// {
+// Collection definitions = instanceContainer.getDefinitions();
+// List items = new ArrayList(definitions.size());
+// for (Iterator i = definitions.iterator();i.hasNext();)
+// {
+// InstanceDefinition def = (InstanceDefinition)i.next();
+// Portlet portlet = def.getPortlet();
+// PortletInfo info = portlet.getInfo();
+// MetaInfo meta = info.getMeta();
+// meta.getMetaValue(MetaInfo.KEYWORDS);
+// SelectItem item = new SelectItem();
+// item.setValue(def.getId());
+// item.setDescription("blah");
+// item.setLabel(def.getId());
+// items.add(item);
+// }
+// return items;
+// }
}
Modified: trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml
===================================================================
--- trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml 2007-02-24 19:12:20 UTC (rev 6391)
+++ trunk/core-admin/src/resources/portal-admin-sar/content/editor.xhtml 2007-02-25 00:18:12 UTC (rev 6392)
@@ -6,7 +6,13 @@
<h:selectOneListbox
value="#{contentURI}">
- <f:selectItems value="#{registry.editors.portlet.instances}"/>
+ <f:selectItems value="#{registry.editors.portlet.instanceItems}"/>
</h:selectOneListbox>
+ <h:panelGroup rendered="#{registry.editors.portlet.instanceMap[contentURI] != null}">
+ <h:outputText value="#{registry.editors.portlet.instanceMap[contentURI].id}"/>
+ </h:panelGroup>
+
+ <h:commandButton value="Show details"/>
+
</div>
\ No newline at end of file
19 years, 2 months
- 1
- 0
JBoss Portal SVN: r6391 - trunk/wsrp/src/resources/portal-wsrp-sar/dtd.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-02-24 14:12:20 -0500 (Sat, 24 Feb 2007)
New Revision: 6391
Modified:
trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-producer_2_6.dtd
Log:
- JBPORTAL-1135: Fixed cut and paste error.
Modified: trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-producer_2_6.dtd
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-producer_2_6.dtd 2007-02-24 04:49:58 UTC (rev 6390)
+++ trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-producer_2_6.dtd 2007-02-24 19:12:20 UTC (rev 6391)
@@ -82,6 +82,6 @@
<!-- A short, human readable name for the property, intended for consumer-generated administration interface. -->
<!ELEMENT label ( #PCDATA )>
<!-- The language in which the label is written. -->
-<!ATTLIST hint xml:lang CDATA #REQUIRED>
+<!ATTLIST label xml:lang CDATA #REQUIRED>
<!-- A resource name identifying the label in localization bundles (currently unsupported in Portal 2.6). -->
-<!ATTLIST hint resourceName CDATA #REQUIRED>
+<!ATTLIST label resourceName CDATA #REQUIRED>
19 years, 2 months
- 1
- 0
JBoss Portal SVN: r6390 - in trunk/wsrp: src/main/org/jboss/portal/test/wsrp/config and 6 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-02-23 23:49:58 -0500 (Fri, 23 Feb 2007)
New Revision: 6390
Added:
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/TestEntityResolver.java
trunk/wsrp/src/resources/portal-wsrp-sar/dtd/
trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-consumer_2_6.dtd
trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-producer_2_6.dtd
Modified:
trunk/wsrp/build.xml
trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/ProducerConfigurationTestCase.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java
trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml
trunk/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml
trunk/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml
trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/custom-policy.xml
trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/extended.xml
trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid1.xml
trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid2.xml
trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid3.xml
trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/minimal.xml
Log:
- WSRPDeployer now uses an EntityResolver to use DTD validation of configuration files.
- Created dtd directory containing DTDs for both consumers and producer configuration.
- DTD for *-wsrp.xml format has been renamed to jboss-wsrp-consumer_2_6.dtd.
- Updated files and tests to use DTDs.
Modified: trunk/wsrp/build.xml
===================================================================
--- trunk/wsrp/build.xml 2007-02-24 00:43:09 UTC (rev 6389)
+++ trunk/wsrp/build.xml 2007-02-24 04:49:58 UTC (rev 6390)
@@ -364,6 +364,7 @@
description="Generates the producer configuration test artifacts" depends="compile">
<jar jarfile="${build.lib.test}/test-producer-configuration-lib.jar">
<fileset dir="${build.resources.test}/test-producer-configuration-lib-jar"/>
+ <fileset dir="${source.resources}/portal-wsrp-sar/dtd"/>
<fileset dir="${build.classes}/">
<include name="org/jboss/portal/test/wsrp/config/**"/>
</fileset>
Modified: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/ProducerConfigurationTestCase.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/ProducerConfigurationTestCase.java 2007-02-24 00:43:09 UTC (rev 6389)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/ProducerConfigurationTestCase.java 2007-02-24 04:49:58 UTC (rev 6390)
@@ -59,6 +59,7 @@
{
unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
factory = new ProducerConfigurationFactory();
+ unmarshaller.setEntityResolver(new TestEntityResolver());
}
public void testCustomPolicyUnmarshalling() throws Exception
Added: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/TestEntityResolver.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/TestEntityResolver.java (rev 0)
+++ trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/TestEntityResolver.java 2007-02-24 04:49:58 UTC (rev 6390)
@@ -0,0 +1,66 @@
+/*
+* JBoss, a division of Red Hat
+* Copyright 2006, Red Hat Middleware, LLC, and individual contributors as indicated
+* by the @authors tag. See the copyright.txt in the distribution for a
+* full listing of individual contributors.
+*
+* This is free software; you can redistribute it and/or modify it
+* under the terms of the GNU Lesser General Public License as
+* published by the Free Software Foundation; either version 2.1 of
+* the License, or (at your option) any later version.
+*
+* This software is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+* Lesser General Public License for more details.
+*
+* You should have received a copy of the GNU Lesser General Public
+* License along with this software; if not, write to the Free
+* Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA
+* 02110-1301 USA, or see the FSF site: http://www.fsf.org.
+*/
+
+package org.jboss.portal.test.wsrp.config;
+
+import org.xml.sax.EntityResolver;
+import org.xml.sax.InputSource;
+import org.xml.sax.SAXException;
+
+import java.io.IOException;
+import java.io.InputStream;
+
+/**
+ * @author <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+ * @version $Revision$
+ * @since 2.6
+ */
+public class TestEntityResolver implements EntityResolver
+{
+ private static final String CONSUMER = "-//JBoss Portal//DTD WSRP Remote Producer Configuration 2.6//EN";
+ private static final String PRODUCER = "-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN";
+
+ public InputSource resolveEntity(String publicId, String systemId) throws SAXException, IOException
+ {
+ String dtd;
+ if (PRODUCER.equals(publicId))
+ {
+ dtd = "jboss-wsrp-producer_2_6.dtd";
+ }
+ else if (CONSUMER.equals(publicId))
+ {
+ dtd = "jboss-wsrp-consumer_2_6.dtd";
+ }
+ else
+ {
+ return null;
+ }
+
+ InputStream dtdStream = Thread.currentThread().getContextClassLoader().getResourceAsStream(dtd);
+ if (dtdStream != null)
+ {
+ return new InputSource(dtdStream);
+ }
+
+ return null;
+ }
+}
Property changes on: trunk/wsrp/src/main/org/jboss/portal/test/wsrp/config/TestEntityResolver.java
___________________________________________________________________
Name: svn:keywords
+ Author Date Id Revision
Name: svn:eol-style
+ native
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java 2007-02-24 00:43:09 UTC (rev 6389)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/deployment/WSRPDeployer.java 2007-02-24 04:49:58 UTC (rev 6390)
@@ -26,10 +26,12 @@
import org.jboss.deployment.DeploymentInfo;
import org.jboss.deployment.SubDeployerSupport;
import org.jboss.portal.common.util.URLTools;
+import org.jboss.portal.common.xml.NullEntityResolver;
import org.jboss.portal.wsrp.portlet.consumers.ConsumersRegistry;
import org.jboss.xb.binding.ObjectModelFactory;
import org.jboss.xb.binding.Unmarshaller;
import org.jboss.xb.binding.UnmarshallerFactory;
+import org.xml.sax.EntityResolver;
import java.net.URL;
import java.util.Iterator;
@@ -56,6 +58,18 @@
/** . */
private String defaultWSRPLocation;
+ private EntityResolver entityResolver;
+
+ public EntityResolver getEntityResolver()
+ {
+ return entityResolver;
+ }
+
+ public void setEntityResolver(EntityResolver entityResolver)
+ {
+ this.entityResolver = entityResolver;
+ }
+
public ConsumersRegistry getConsumerRegistry()
{
return consumerRegistry;
@@ -84,8 +98,13 @@
{
Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller();
ObjectModelFactory factory = new WSRPDeploymentFactory(consumerRegistry);
- WSRPDeployment deployment = (WSRPDeployment)unmarshaller.unmarshal(di.localUrl.openStream(), factory, null);
- di.metaData = deployment;
+ if (entityResolver == null)
+ {
+ log.debug("Coult not obtain entity resolver for WSRPDeployer");
+ entityResolver = new NullEntityResolver();
+ }
+ unmarshaller.setEntityResolver(entityResolver);
+ di.metaData = unmarshaller.unmarshal(di.localUrl.openStream(), factory, null);
}
catch (Exception e)
{
Modified: trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2007-02-24 00:43:09 UTC (rev 6389)
+++ trunk/wsrp/src/resources/portal-wsrp-sar/META-INF/jboss-service.xml 2007-02-24 04:49:58 UTC (rev 6390)
@@ -108,11 +108,29 @@
<attribute name="ConfigLocation">conf/producer/config.xml</attribute>
</mbean>
+ <mbean
+ code="org.jboss.portal.server.impl.xml.EntityResolverService"
+ name="portal.wsrp:service=EntityResolver"
+ xmbean-dd=""
+ xmbean-code="org.jboss.portal.jems.as.system.JBossServiceModelMBean">
+ <xmbean/>
+ <attribute name="DTDMapping">
+ <properties>
+ <entry
+ key="-//JBoss Portal//DTD WSRP Remote Producer Configuration 2.6//EN">dtd/jboss-wsrp-consumer_2_6.dtd</entry>
+ <entry
+ key="-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN">dtd/jboss-wsrp-producer_2_6.dtd</entry>
+ </properties>
+ </attribute>
+ </mbean>
+
<!-- Deployer for *-wsrp.xml files. Deploys default-wsrp.xml which contains the 'self' consumer -->
<mbean code="org.jboss.portal.wsrp.deployment.WSRPDeployer" name="portal.wsrp:service=WSRPDeployer">
<attribute name="DefaultWSRPLocation">default-wsrp.xml</attribute>
<depends optional-attribute-name="ConsumerRegistry"
proxy-type="attribute">portal.wsrp:service=ConsumersRegistry</depends>
+ <depends optional-attribute-name="EntityResolver"
+ proxy-type="attribute">portal.wsrp:service=EntityResolver</depends>
</mbean>
<mbean
Modified: trunk/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml 2007-02-24 00:43:09 UTC (rev 6389)
+++ trunk/wsrp/src/resources/portal-wsrp-sar/conf/producer/config.xml 2007-02-24 04:49:58 UTC (rev 6390)
@@ -21,6 +21,9 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE producer-configuration PUBLIC "-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN"
+ "http://www.jboss.org/portal/dtd/jboss-wsrp-producer_2_6.dtd">
+
<producer-configuration>
<registration-configuration fullServiceDescriptionRequiresRegistration="true">
<registration-property-validator>org.jboss.portal.registration.policies.DefaultRegistrationPropertyValidator</registration-property-validator>
Modified: trunk/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml 2007-02-24 00:43:09 UTC (rev 6389)
+++ trunk/wsrp/src/resources/portal-wsrp-sar/default-wsrp.xml 2007-02-24 04:49:58 UTC (rev 6390)
@@ -23,8 +23,8 @@
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-<!--<!DOCTYPE deployments PUBLIC "-//JBoss//DTD WSRP Remote Producer Configuration 1.0//EN"
- "http://www.jboss.org/portal/dtd/jboss-portal-wsrp.dtd">-->
+<!DOCTYPE deployments PUBLIC "-//JBoss Portal//DTD WSRP Remote Producer Configuration 2.6//EN"
+ "http://www.jboss.org/portal/dtd/jboss-wsrp-consumer_2_6.dtd">
<deployments>
<deployment>
Copied: trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-consumer_2_6.dtd (from rev 6388, trunk/wsrp/src/resources/jboss-portal-wsrp.dtd)
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-consumer_2_6.dtd (rev 0)
+++ trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-consumer_2_6.dtd 2007-02-24 04:49:58 UTC (rev 6390)
@@ -0,0 +1,85 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!--
+JBoss Portal's WSRP Remote Producer Configuration deployment descriptor for the *-wsrp.xml files used by Portal to be
+able to consume WSRP portlets exposed by a remote producer.
+author: <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+version: 1.1 (Portal 2.6)
+revision: $Revision$
+-->
+
+<!-- The root element. Contains deployment elements. -->
+<!ELEMENT deployments ( deployment* )>
+
+<!-- Deployment related information. As of Portal 2.6, the only deployment information relates to WSRP remote producers. -->
+<!ELEMENT deployment ( wsrp-producer )>
+
+<!-- Information on a remote WSRP producer identified by the mandatory producer-id attribute. -->
+<!ELEMENT wsrp-producer ( ( endpoint-config | endpoint-wsdl-url ), registration-data? )>
+
+<!-- The producer identifier. This should be unique for a given Portal deployment. The identifier is used to
+identify the portlet provider in the management interface. -->
+<!ATTLIST wsrp-producer id CDATA #REQUIRED>
+
+<!-- The period of producer information (such as list of offered portlets) cache refreshing in seconds. -->
+<!ATTLIST wsrp-producer expiration-cache CDATA #IMPLIED>
+
+<!-- WSRP endpoints configuration information by interface URL. Mutually exclusive with endpoint-wsdl-url. -->
+<!ELEMENT endpoint-config ( service-description-url, markup-url, registration-url?, portlet-management-url? )>
+
+<!-- The URL for the service description interface endpoint on the remote producer. -->
+<!ELEMENT service-description-url ( #PCDATA )>
+
+<!-- The URL for the markup interface endpoint on the remote producer. -->
+<!ELEMENT markup-url ( #PCDATA )>
+
+<!-- The URL for the optional portlet management interface endpoint on the remote producer. -->
+<!ELEMENT portlet-management-url ( #PCDATA )>
+
+<!-- The URL for the optional registration interface endpoint on the remote producer. -->
+<!ELEMENT registration-url ( #PCDATA )>
+
+<!-- The URL of the WSDL description of the producer's WSRP services. Mutally exclusive with endpoint-config. -->
+<!ELEMENT endpoint-wsdl-url ( #PCDATA )>
+
+<!-- Container for registration information. -->
+<!ELEMENT registration-data ( consumer-name?, property* )>
+
+<!--
+An optional name (preferably unique) that identifies the Consumer. An example of such a name would be the Consumer's URL.
+If no consumer-name is provided, one will be automatically generated by JBoss Portal.
+-->
+<!ELEMENT consumer-name ( #PCDATA )>
+
+<!-- A registration property. -->
+<!ELEMENT property ( name, lang, value )>
+
+<!-- The name of the property. -->
+<!ELEMENT name ( #PCDATA )>
+
+<!-- The language the property is in. -->
+<!ELEMENT lang ( #PCDATA )>
+
+<!-- The value of the property. -->
+<!ELEMENT value ( #PCDATA )>
\ No newline at end of file
Property changes on: trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-consumer_2_6.dtd
___________________________________________________________________
Name: svn:keywords
+ LastChangedRevision
Added: trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-producer_2_6.dtd
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-producer_2_6.dtd (rev 0)
+++ trunk/wsrp/src/resources/portal-wsrp-sar/dtd/jboss-wsrp-producer_2_6.dtd 2007-02-24 04:49:58 UTC (rev 6390)
@@ -0,0 +1,87 @@
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ JBoss, a division of Red Hat ~
+ ~ Copyright 2006, Red Hat Middleware, LLC, and individual ~
+ ~ contributors as indicated by the @authors tag. See the ~
+ ~ copyright.txt in the distribution for a full listing of ~
+ ~ individual contributors. ~
+ ~ ~
+ ~ This is free software; you can redistribute it and/or modify it ~
+ ~ under the terms of the GNU Lesser General Public License as ~
+ ~ published by the Free Software Foundation; either version 2.1 of ~
+ ~ the License, or (at your option) any later version. ~
+ ~ ~
+ ~ This software is distributed in the hope that it will be useful, ~
+ ~ but WITHOUT ANY WARRANTY; without even the implied warranty of ~
+ ~ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ~
+ ~ Lesser General Public License for more details. ~
+ ~ ~
+ ~ You should have received a copy of the GNU Lesser General Public ~
+ ~ License along with this software; if not, write to the Free ~
+ ~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
+ ~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
+<!--
+A DTD for the configuration of Portal's WSRP producer.
+
+author: <a href="mailto:chris.laprun@jboss.com">Chris Laprun</a>
+version: 1.0 (Portal 2.6)
+revision: $Revision: 5561 $
+-->
+
+<!-- Root element for the producer configuration. Contains a single registration-configuration as of Portal 2.6 -->
+<!ELEMENT producer-configuration ( registration-configuration )>
+
+
+<!-- Allows configuration of whether the producer requires registration or not and how to deal with registrations. -->
+<!ELEMENT registration-configuration ( (registration-property-validator | registration-policy)?, registration-property-description* )>
+
+<!--
+Specifies whether the producer will send a complete service description (that is one including offered portlets) or not
+to unregistered consumers.
+-->
+<!ATTLIST registration-configuration fullServiceDescriptionRequiresRegistration (true | false) "false">
+
+<!--
+A fully-qualified class name for a class implementing the RegistrationPropertyValidator interface. Only makes sense when
+using the default RegistrationPolicy.
+-->
+<!ELEMENT registration-property-validator ( #PCDATA )>
+
+<!--
+A fully-qualified class name for an implementation of the RegistrationPolicy interface, allowing users to customize
+the behavior of the producer when handling registration attempts.
+ -->
+<!ELEMENT registration-policy ( #PCDATA )>
+
+<!--
+The description for a registration property for which the producer will require consumers to provide a value.
+Example:
+<registration-property-description>
+ <name>name1</name>
+ <type>xsd:string</type>
+ <hint xml:lang="en" resourceName="resource.hint1">hint1</hint>
+ <label xml:lang="en" resourceName="resource.label1">label1</label>
+</registration-property-description>
+-->
+<!ELEMENT registration-property-description ( name, type, hint, label )>
+
+<!-- The name of the registration property -->
+<!ELEMENT name ( #PCDATA )>
+
+<!-- The qualified name of the type of the registration property. As of Portal 2.6, only xml:string is supported. -->
+<!ELEMENT type ( #PCDATA )>
+
+<!-- A description of the registration property and its usage targeted at end users. -->
+<!ELEMENT hint ( #PCDATA )>
+<!-- The language in which the hint is written. -->
+<!ATTLIST hint xml:lang CDATA #REQUIRED>
+<!-- A resource name identifying the hint in localization bundles (currently unsupported in Portal 2.6). -->
+<!ATTLIST hint resourceName CDATA #REQUIRED>
+
+<!-- A short, human readable name for the property, intended for consumer-generated administration interface. -->
+<!ELEMENT label ( #PCDATA )>
+<!-- The language in which the label is written. -->
+<!ATTLIST hint xml:lang CDATA #REQUIRED>
+<!-- A resource name identifying the label in localization bundles (currently unsupported in Portal 2.6). -->
+<!ATTLIST hint resourceName CDATA #REQUIRED>
Modified: trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/custom-policy.xml
===================================================================
--- trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/custom-policy.xml 2007-02-24 00:43:09 UTC (rev 6389)
+++ trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/custom-policy.xml 2007-02-24 04:49:58 UTC (rev 6390)
@@ -20,7 +20,9 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
-
+<!DOCTYPE producer-configuration PUBLIC "-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN"
+ "http://www.jboss.org/portal/dtd/jboss-wsrp-producer_2_6.dtd">
+
<producer-configuration>
<registration-configuration>
<registration-policy>org.jboss.portal.test.wsrp.config.TestRegistrationPolicy</registration-policy>
Modified: trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/extended.xml
===================================================================
--- trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/extended.xml 2007-02-24 00:43:09 UTC (rev 6389)
+++ trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/extended.xml 2007-02-24 04:49:58 UTC (rev 6390)
@@ -20,6 +20,8 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE producer-configuration PUBLIC "-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN"
+ "http://www.jboss.org/portal/dtd/jboss-wsrp-producer_2_6.dtd">
<producer-configuration>
<registration-configuration fullServiceDescriptionRequiresRegistration="true">
Modified: trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid1.xml
===================================================================
--- trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid1.xml 2007-02-24 00:43:09 UTC (rev 6389)
+++ trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid1.xml 2007-02-24 04:49:58 UTC (rev 6390)
@@ -20,6 +20,8 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE producer-configuration PUBLIC "-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN"
+ "http://www.jboss.org/portal/dtd/jboss-wsrp-producer_2_6.dtd">
<producer-configuration>
<registration-configuration fullServiceDescriptionRequiresRegistration="invalid"/>
Modified: trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid2.xml
===================================================================
--- trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid2.xml 2007-02-24 00:43:09 UTC (rev 6389)
+++ trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid2.xml 2007-02-24 04:49:58 UTC (rev 6390)
@@ -20,6 +20,8 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE producer-configuration PUBLIC "-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN"
+ "http://www.jboss.org/portal/dtd/jboss-wsrp-producer_2_6.dtd">
<producer-configuration>
<registration-configuration/>
Modified: trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid3.xml
===================================================================
--- trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid3.xml 2007-02-24 00:43:09 UTC (rev 6389)
+++ trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/invalid3.xml 2007-02-24 04:49:58 UTC (rev 6390)
@@ -20,6 +20,9 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE producer-configuration PUBLIC "-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN"
+ "http://www.jboss.org/portal/dtd/jboss-wsrp-producer_2_6.dtd">
+
<producer-configuration>
<registration-configuration>
<registration-policy>org.jboss.portal.test.wsrp.config.TestRegistrationPolicy</registration-policy>
Modified: trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/minimal.xml
===================================================================
--- trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/minimal.xml 2007-02-24 00:43:09 UTC (rev 6389)
+++ trunk/wsrp/src/resources/tests/test-producer-configuration-lib-jar/minimal.xml 2007-02-24 04:49:58 UTC (rev 6390)
@@ -20,6 +20,8 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE producer-configuration PUBLIC "-//JBoss Portal//DTD WSRP Local Producer Configuration 2.6//EN"
+ "http://www.jboss.org/portal/dtd/jboss-wsrp-producer_2_6.dtd">
<producer-configuration><registration-configuration/></producer-configuration>
19 years, 2 months
- 1
- 0
JBoss Portal SVN: r6389 - trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-02-23 19:43:09 -0500 (Fri, 23 Feb 2007)
New Revision: 6389
Modified:
trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-portlet.xml
Log:
- Added DTD definition.
Modified: trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-portlet.xml
===================================================================
--- trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-portlet.xml 2007-02-23 23:11:09 UTC (rev 6388)
+++ trunk/wsrp/src/resources/portal-wsrp-war/WEB-INF/jboss-portlet.xml 2007-02-24 00:43:09 UTC (rev 6389)
@@ -20,6 +20,7 @@
~ Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA ~
~ 02110-1301 USA, or see the FSF site: http://www.fsf.org. ~
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+<!DOCTYPE portlet-app PUBLIC "-//JBoss Portal//DTD JBoss Portlet 2.6//EN" "http://www.jboss.org/portal/dtd/jboss-portlet_2_6.dtd">
<portlet-app>
<service>
<service-name>ConsumersRegistry</service-name>
19 years, 2 months
- 1
- 0
JBoss Portal SVN: r6388 - trunk/build/ide/intellij/idea60.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-02-23 18:11:09 -0500 (Fri, 23 Feb 2007)
New Revision: 6388
Modified:
trunk/build/ide/intellij/idea60/jboss-portal.ipr
Log:
- Updated IDEA project: Portal should now compile in IDEA.
Modified: trunk/build/ide/intellij/idea60/jboss-portal.ipr
===================================================================
--- trunk/build/ide/intellij/idea60/jboss-portal.ipr 2007-02-23 23:07:37 UTC (rev 6387)
+++ trunk/build/ide/intellij/idea60/jboss-portal.ipr 2007-02-23 23:11:09 UTC (rev 6388)
@@ -258,14 +258,19 @@
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/cms/cms.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/cms/cms.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/common/common.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/common/common.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core/core.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core/core.iml" />
+ <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-admin/core-admin.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-admin/core-admin.iml" />
+ <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-cms/core-cms.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-cms/core-cms.iml" />
+ <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-management/core-management.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-management/core-management.iml" />
+ <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-samples/core-samples.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/core-samples/core-samples.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/faces/faces.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/faces/faces.iml" />
- <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/federation/federation.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/federation/federation.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/format/format.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/format/format.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/identity/identity.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/identity/identity.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/jems/jems.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/jems/jems.iml" />
- <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/management/management.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/management/management.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/migration/migration.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/migration/migration.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/portlet/portlet.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/portlet/portlet.iml" />
+ <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/portlet-federation/portlet-federation.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/portlet-federation/portlet-federation.iml" />
+ <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/registration/registration.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/registration/registration.iml" />
+ <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/search/search.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/search/search.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/security/security.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/security/security.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/server/server.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/server/server.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/test/test.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/test/test.iml" />
@@ -273,11 +278,13 @@
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/theme/theme.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/theme/theme.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/tools/tools.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/tools/tools.iml" />
+ <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/widget/widget.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/widget/widget.iml" />
+ <module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/workflow/workflow.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/workflow/workflow.iml" />
<module fileurl="file://$PROJECT_DIR$/build/ide/intellij/idea60/modules/wsrp/wsrp.iml" filepath="$PROJECT_DIR$/build/ide/intellij/idea60/modules/wsrp/wsrp.iml" />
</modules>
</component>
- <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="false" project-jdk-name="1.4" project-jdk-type="JavaSDK">
- <output url="file://$PROJECT_DIR$/classes" />
+ <component name="ProjectRootManager" version="2" assert-keyword="true" jdk-15="false" project-jdk-name="1.5" project-jdk-type="JavaSDK">
+ <output url="file://$PROJECT_DIR$/output" />
</component>
<component name="ProjectRunConfigurationManager" />
<component name="RmicSettings">
@@ -471,31 +478,7 @@
<option name="useAlternate" value="false" />
</LanguageOptions>
</component>
- <component name="libraryTable">
- <library name="apacheds">
- <CLASSES>
- <root url="jar://$PROJECT_DIR$/thirdparty/apache-directory/lib/apacheds-core-1.0-RC4.jar!/" />
- <root url="jar://$PROJECT_DIR$/thirdparty/apache-directory/lib/apacheds-core-shared-1.0-RC4.jar!/" />
- <root url="jar://$PROJECT_DIR$/thirdparty/apache-directory/lib/apacheds-kerberos-shared-1.0-RC4.jar!/" />
- <root url="jar://$PROJECT_DIR$/thirdparty/apache-directory/lib/apacheds-protocol-changepw-1.0-RC4.jar!/" />
- <root url="jar://$PROJECT_DIR$/thirdparty/apache-directory/lib/apacheds-protocol-kerberos-1.0-RC4.jar!/" />
- <root url="jar://$PROJECT_DIR$/thirdparty/apache-directory/lib/apacheds-protocol-ldap-1.0-RC4.jar!/" />
- <root url="jar://$PROJECT_DIR$/thirdparty/apache-directory/lib/apacheds-protocol-shared-1.0-RC4.jar!/" />
- <root url="jar://$PROJECT_DIR$/thirdparty/apache-directory/lib/apacheds-server-jndi-1.0-RC4.jar!/" />
- <root url="jar://$PROJECT_DIR$/thirdparty/apache-directory/lib/apacheds-server-main-1.0-RC4.jar!/" />
- <root url="jar://$PROJECT_DIR$/thirdparty/apache-directory/lib/apacheds-server-tools-1.0-RC4.jar!/" />
- <root url="jar://$PROJECT_DIR$/thirdparty/apache-directory/lib/jdbm-1.0.jar!/" />
- <root url="jar://$PROJECT_DIR$/thirdparty/apache-directory/lib/mina-core-0.9.5.jar!/" />
- <root url="jar://$PROJECT_DIR$/thirdparty/apache-directory/lib/mina-filter-codec-asn1-0.9.5.jar!/" />
- <root url="jar://$PROJECT_DIR$/thirdparty/apache-directory/lib/mina-filter-ssl-0.9.5.jar!/" />
- <root url="jar://$PROJECT_DIR$/thirdparty/apache-directory/lib/nlog4j-1.2.25.jar!/" />
- <root url="jar://$PROJECT_DIR$/thirdparty/apache-directory/lib/shared-asn1-0.9.5.2.jar!/" />
- <root url="jar://$PROJECT_DIR$/thirdparty/apache-directory/lib/shared-ldap-0.9.5.2.jar!/" />
- </CLASSES>
- <JAVADOC />
- <SOURCES />
- </library>
- </component>
+ <component name="libraryTable" />
<component name="uidesigner-configuration">
<option name="INSTRUMENT_CLASSES" value="true" />
<option name="COPY_FORMS_RUNTIME_TO_OUTPUT" value="true" />
19 years, 2 months
- 1
- 0
JBoss Portal SVN: r6387 - in trunk: build/ide/intellij/idea60/modules/cms and 13 other directories.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-02-23 18:07:37 -0500 (Fri, 23 Feb 2007)
New Revision: 6387
Modified:
trunk/build/build-thirdparty.xml
trunk/build/ide/intellij/idea60/modules/cms/cms.iml
trunk/build/ide/intellij/idea60/modules/core-admin/core-admin.iml
trunk/build/ide/intellij/idea60/modules/core-cms/core-cms.iml
trunk/build/ide/intellij/idea60/modules/core-management/core-management.iml
trunk/build/ide/intellij/idea60/modules/core-samples/core-samples.iml
trunk/build/ide/intellij/idea60/modules/jems/jems.iml
trunk/build/ide/intellij/idea60/modules/search/search.iml
trunk/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml
trunk/build/ide/intellij/idea60/modules/tools/tools.iml
trunk/build/ide/intellij/idea60/modules/widget/widget.iml
trunk/build/ide/intellij/idea60/modules/workflow/workflow.iml
trunk/build/ide/intellij/idea60/modules/wsrp/wsrp.iml
trunk/cms/src/main/org/jboss/portal/cms/search/CMSFederatedSearch.java
trunk/core-cms/src/main/org/jboss/portal/core/cms/content/CMSFaceletContentEditor.java
Log:
- Updated build-thirdparty.xml to add wutka-dtdparser and updated version and vendor info.
- Updated IDEA modules: Portal should now compile in IDEA.
Modified: trunk/build/build-thirdparty.xml
===================================================================
--- trunk/build/build-thirdparty.xml 2007-02-23 19:21:29 UTC (rev 6386)
+++ trunk/build/build-thirdparty.xml 2007-02-23 23:07:37 UTC (rev 6387)
@@ -1,19 +1,19 @@
<?xml version="1.0"?>
<project name="main.build"
- default="synchronize"
- basedir=".">
+ default="synchronize"
+ basedir=".">
<!-- Property File definitions -->
- <!--<property file="local.properties"/>
- <property file="synchronize.properties"/>-->
+ <!--<property file="local.properties"/>
+ <property file="synchronize.properties"/>-->
<property environment="env"/>
<!-- Property Definitions -->
<property name="generatedLibrariesFiles" value="../thirdparty/libraries.ent"/>
- <property name="jboss.tasks.path"
- value="../tools/lib/jbossbuild.jar" />
+ <property name="jboss.tasks.path"
+ value="../tools/lib/jbossbuild.jar"/>
<!-- Allow jbossbuild.repository to be set from (in order or priority)
+ Command line -Djbossbuild.repository=...
@@ -27,16 +27,14 @@
<property name="jbossbuild.repository" value="http://repository.jboss.com"/>
<!-- File Imports -->
- <import file="../tools/etc/jbossbuild/tasks.xml"/>
-
-
-
+ <import file="../tools/etc/jbossbuild/tasks.xml"/>
+
<!-- Main Definition of dependencies -->
<build id="jbossportal-thirdparty"
impltitle="JBossPortal"
- implversion="jboss-portal-2.4.0.BETA1"
- implvendor="JBoss Inc."
+ implversion="jboss-portal-2.6.0.BETA1"
+ implvendor="JBoss, a division of Red Hat Inc."
implurl="http://www.jboss.org"
description="JBoss Portal"
cvsroot="${cvs.prefix}@cvs.forge.jboss.com:/cvsroot/jboss"
@@ -110,18 +108,18 @@
<componentref name="sun-opends" version="snapshot"/>
<componentref name="sun-servlet" version="2.4"/>
<componentref name="xdoclet" version="1.2.3"/>
- <componentref name="jbpm/jaronly" version="3.1.2"/>
-
+ <componentref name="jbpm/jaronly" version="3.1.2"/>
+ <componentref name="wutka-dtdparser" version="1.2.1"/>
</build>
<synchronizeinfo/>
<target name="generate-lib-file"
- description="generate libraries.ent and thirdparty license info"
- depends="synchronize">
- <gen-lib-file filename="${generatedLibrariesFiles}" />
+ description="generate libraries.ent and thirdparty license info"
+ depends="synchronize">
+ <gen-lib-file filename="${generatedLibrariesFiles}"/>
<visit-componentref-graph
- componentVisitor="org.jboss.ant.util.graph.ComponentRefGraphLicenseVisitor" />
+ componentVisitor="org.jboss.ant.util.graph.ComponentRefGraphLicenseVisitor"/>
</target>
<!-- Generate the targets -->
Modified: trunk/build/ide/intellij/idea60/modules/cms/cms.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/cms/cms.iml 2007-02-23 19:21:29 UTC (rev 6386)
+++ trunk/build/ide/intellij/idea60/modules/cms/cms.iml 2007-02-23 23:07:37 UTC (rev 6387)
@@ -170,6 +170,8 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="search" />
+ <orderEntry type="module" module-name="security" />
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: trunk/build/ide/intellij/idea60/modules/core-admin/core-admin.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/core-admin/core-admin.iml 2007-02-23 19:21:29 UTC (rev 6386)
+++ trunk/build/ide/intellij/idea60/modules/core-admin/core-admin.iml 2007-02-23 23:07:37 UTC (rev 6387)
@@ -5,6 +5,7 @@
<exclude-output />
<content url="file://$MODULE_DIR$/../../../../../../core-admin">
<sourceFolder url="file://$MODULE_DIR$/../../../../../../core-admin/src/main" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../core-admin/output" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -100,11 +101,202 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-jmx.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-system.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
<option name="ACTIVE_VCS_NAME" value="svn" />
<option name="USE_PROJECT_VCS" value="false" />
</component>
+ <component name="copyright">
+ <Base>
+ <setting name="state" value="1" />
+ </Base>
+ <LanguageOptions name="$TEMPLATE$">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="true" />
+ <option name="separateAfter" value="true" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="true" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="JBoss, a division of Red Hat Copyright &#36;today.year, 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 Fr!
anklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="4" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="CSS">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="HTML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JAVA">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JSP">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JavaScript">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="Properties">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="XML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ </component>
</module>
Modified: trunk/build/ide/intellij/idea60/modules/core-cms/core-cms.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/core-cms/core-cms.iml 2007-02-23 19:21:29 UTC (rev 6386)
+++ trunk/build/ide/intellij/idea60/modules/core-cms/core-cms.iml 2007-02-23 23:07:37 UTC (rev 6387)
@@ -5,6 +5,7 @@
<exclude-output />
<content url="file://$MODULE_DIR$/../../../../../../core-cms">
<sourceFolder url="file://$MODULE_DIR$/../../../../../../core-cms/src/main" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../core-cms/output" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -54,11 +55,223 @@
<orderEntry type="module" module-name="common" />
<orderEntry type="module" module-name="theme" />
<orderEntry type="module" module-name="core-admin" />
+ <orderEntry type="module" module-name="jems" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-fileupload/lib/commons-fileupload.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module" module-name="search" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-system.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module" module-name="security" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-common.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/apache-myfaces/lib/myfaces-api.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
<option name="ACTIVE_VCS_NAME" value="svn" />
<option name="USE_PROJECT_VCS" value="false" />
</component>
+ <component name="copyright">
+ <Base>
+ <setting name="state" value="1" />
+ </Base>
+ <LanguageOptions name="$TEMPLATE$">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="true" />
+ <option name="separateAfter" value="true" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="true" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="JBoss, a division of Red Hat Copyright &#36;today.year, 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 Fr!
anklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="4" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="CSS">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="HTML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JAVA">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JSP">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JavaScript">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="Properties">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="XML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ </component>
</module>
Modified: trunk/build/ide/intellij/idea60/modules/core-management/core-management.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/core-management/core-management.iml 2007-02-23 19:21:29 UTC (rev 6386)
+++ trunk/build/ide/intellij/idea60/modules/core-management/core-management.iml 2007-02-23 23:07:37 UTC (rev 6387)
@@ -5,6 +5,7 @@
<exclude-output />
<content url="file://$MODULE_DIR$/../../../../../../core-management">
<sourceFolder url="file://$MODULE_DIR$/../../../../../../core-management/src/main" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../core-management/output" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -30,11 +31,194 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-common.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module" module-name="portlet-federation" />
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
<option name="ACTIVE_VCS_NAME" value="svn" />
<option name="USE_PROJECT_VCS" value="false" />
</component>
+ <component name="copyright">
+ <Base>
+ <setting name="state" value="1" />
+ </Base>
+ <LanguageOptions name="$TEMPLATE$">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="true" />
+ <option name="separateAfter" value="true" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="true" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="JBoss, a division of Red Hat Copyright &#36;today.year, 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 Fr!
anklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="4" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="CSS">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="HTML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JAVA">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JSP">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JavaScript">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="Properties">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="XML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ </component>
</module>
Modified: trunk/build/ide/intellij/idea60/modules/core-samples/core-samples.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/core-samples/core-samples.iml 2007-02-23 19:21:29 UTC (rev 6386)
+++ trunk/build/ide/intellij/idea60/modules/core-samples/core-samples.iml 2007-02-23 23:07:37 UTC (rev 6387)
@@ -5,6 +5,7 @@
<exclude-output />
<content url="file://$MODULE_DIR$/../../../../../../core-samples">
<sourceFolder url="file://$MODULE_DIR$/../../../../../../core-samples/src/main" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../core-samples/output" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -32,11 +33,185 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="theme" />
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
<option name="ACTIVE_VCS_NAME" value="svn" />
<option name="USE_PROJECT_VCS" value="false" />
</component>
+ <component name="copyright">
+ <Base>
+ <setting name="state" value="1" />
+ </Base>
+ <LanguageOptions name="$TEMPLATE$">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="true" />
+ <option name="separateAfter" value="true" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="true" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="JBoss, a division of Red Hat Copyright &#36;today.year, 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 Fr!
anklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="4" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="CSS">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="HTML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JAVA">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JSP">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JavaScript">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="Properties">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="XML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ </component>
</module>
Modified: trunk/build/ide/intellij/idea60/modules/jems/jems.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/jems/jems.iml 2007-02-23 19:21:29 UTC (rev 6386)
+++ trunk/build/ide/intellij/idea60/modules/jems/jems.iml 2007-02-23 23:07:37 UTC (rev 6387)
@@ -12,7 +12,7 @@
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module" module-name="common" />
<orderEntry type="module" module-name="test" />
- <orderEntry type="module-library" exported="">
+ <orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-jmx.jar!/" />
@@ -39,7 +39,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
+ <orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-system.jar!/" />
@@ -120,7 +120,7 @@
<SOURCES />
</library>
</orderEntry>
- <orderEntry type="module-library" exported="">
+ <orderEntry type="module-library">
<library>
<CLASSES>
<root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-common.jar!/" />
Modified: trunk/build/ide/intellij/idea60/modules/search/search.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/search/search.iml 2007-02-23 19:21:29 UTC (rev 6386)
+++ trunk/build/ide/intellij/idea60/modules/search/search.iml 2007-02-23 23:07:37 UTC (rev 6387)
@@ -5,6 +5,7 @@
<exclude-output />
<content url="file://$MODULE_DIR$/../../../../../../search">
<sourceFolder url="file://$MODULE_DIR$/../../../../../../search/src/main" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../search/output" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -26,11 +27,203 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="jems" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-system.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-jmx.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
<option name="ACTIVE_VCS_NAME" value="svn" />
<option name="USE_PROJECT_VCS" value="false" />
</component>
+ <component name="copyright">
+ <Base>
+ <setting name="state" value="1" />
+ </Base>
+ <LanguageOptions name="$TEMPLATE$">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="true" />
+ <option name="separateAfter" value="true" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="true" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="JBoss, a division of Red Hat Copyright &#36;today.year, 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 Fr!
anklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="4" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="CSS">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="HTML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JAVA">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JSP">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JavaScript">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="Properties">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="XML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ </component>
</module>
Modified: trunk/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml 2007-02-23 19:21:29 UTC (rev 6386)
+++ trunk/build/ide/intellij/idea60/modules/thirdparty/thirdparty.iml 2007-02-23 23:07:37 UTC (rev 6387)
@@ -4,7 +4,66 @@
<component name="NewModuleRootManager" inherit-compiler-output="false">
<output url="file://$MODULE_DIR$/../../../../../../thirdparty/classes" />
<exclude-output />
- <content url="file://$MODULE_DIR$" />
+ <content url="file://$MODULE_DIR$/../../../../../../thirdparty">
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/antlr" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/apache-ant" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/apache-codec" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/apache-collections" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/apache-fileupload" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/apache-httpclient" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/apache-lang" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/apache-log4j" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/apache-logging" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/apache-lucene" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/apache-myfaces" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/apache-net" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/apache-tomahawk" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/apache-xerces" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/apache-xmlsec" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/asm" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/aspectj" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/beanshell" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/cglib" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/dbunit" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/dom4j" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/ehcache" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/el" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/facelets" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/hibernate" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/hsqldb" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/httpunit" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/ibm-wsdl4j" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/jackrabbit" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/jakarta-cactus" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/jakarta-io" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/javassist" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/jboss" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/jbossas" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/jbpm" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/jcr" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/jetty" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/jflex" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/jgroups" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/jsunit" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/junit" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/jwebunit" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/licenses" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/nekohtml" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/odmg" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/oswego-concurrent" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/portals-bridges" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/qdox" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/sleepycat" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/slf4j" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/sun-jaf" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/sun-javacc" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/sun-javamail" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/sun-opends" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/sun-servlet" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/trove" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/wutka-dtdparser" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../thirdparty/xdoclet" />
+ </content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntryProperties />
Modified: trunk/build/ide/intellij/idea60/modules/tools/tools.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/tools/tools.iml 2007-02-23 19:21:29 UTC (rev 6386)
+++ trunk/build/ide/intellij/idea60/modules/tools/tools.iml 2007-02-23 23:07:37 UTC (rev 6387)
@@ -9,6 +9,15 @@
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/wutka-dtdparser/lib/dtdparser121.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: trunk/build/ide/intellij/idea60/modules/widget/widget.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/widget/widget.iml 2007-02-23 19:21:29 UTC (rev 6386)
+++ trunk/build/ide/intellij/idea60/modules/widget/widget.iml 2007-02-23 23:07:37 UTC (rev 6387)
@@ -11,11 +11,202 @@
<orderEntry type="module" module-name="portlet" />
<orderEntry type="module" module-name="common" />
<orderEntry type="module" module-name="jems" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-system.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-jmx.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
<option name="ACTIVE_VCS_NAME" value="svn" />
<option name="USE_PROJECT_VCS" value="false" />
</component>
+ <component name="copyright">
+ <Base>
+ <setting name="state" value="1" />
+ </Base>
+ <LanguageOptions name="$TEMPLATE$">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="true" />
+ <option name="separateAfter" value="true" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="true" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="JBoss, a division of Red Hat Copyright &#36;today.year, 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 Fr!
anklin St, Fifth Floor, Boston, MA 02110-1301 USA, or see the FSF site: http://www.fsf.org." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="4" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="CSS">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="HTML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JAVA">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JSP">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="JavaScript">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="Properties">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="1" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ <LanguageOptions name="XML">
+ <option name="templateOptions">
+ <value>
+ <option name="block" value="true" />
+ <option name="separateBefore" value="false" />
+ <option name="separateAfter" value="false" />
+ <option name="prefixLines" value="true" />
+ <option name="lenBefore" value="80" />
+ <option name="lenAfter" value="80" />
+ <option name="box" value="false" />
+ <option name="filler" value=" " />
+ </value>
+ </option>
+ <option name="notice" value="Copyright (c) &#36;today.year, Your Corporation. All Rights Reserved." />
+ <option name="keyword" value="Copyright" />
+ <option name="fileTypeOverride" value="2" />
+ <option name="relativeBefore" value="true" />
+ <option name="addBlankAfter" value="true" />
+ <option name="fileLocation" value="1" />
+ <option name="useAlternate" value="false" />
+ </LanguageOptions>
+ </component>
</module>
Modified: trunk/build/ide/intellij/idea60/modules/workflow/workflow.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/workflow/workflow.iml 2007-02-23 19:21:29 UTC (rev 6386)
+++ trunk/build/ide/intellij/idea60/modules/workflow/workflow.iml 2007-02-23 23:07:37 UTC (rev 6387)
@@ -5,6 +5,7 @@
<exclude-output />
<content url="file://$MODULE_DIR$/../../../../../../workflow">
<sourceFolder url="file://$MODULE_DIR$/../../../../../../workflow/src/main" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/../../../../../../workflow/output" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
@@ -46,6 +47,25 @@
<SOURCES />
</library>
</orderEntry>
+ <orderEntry type="module" module-name="identity" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-system.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/jbossas/core-libs/lib/jboss-jmx.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
</component>
<component name="VcsManagerConfiguration">
Modified: trunk/build/ide/intellij/idea60/modules/wsrp/wsrp.iml
===================================================================
--- trunk/build/ide/intellij/idea60/modules/wsrp/wsrp.iml 2007-02-23 19:21:29 UTC (rev 6386)
+++ trunk/build/ide/intellij/idea60/modules/wsrp/wsrp.iml 2007-02-23 23:07:37 UTC (rev 6387)
@@ -156,6 +156,15 @@
<orderEntry type="module" module-name="jems" />
<orderEntry type="module" module-name="registration" />
<orderEntry type="module" module-name="portlet-federation" />
+ <orderEntry type="module-library">
+ <library>
+ <CLASSES>
+ <root url="jar://$MODULE_DIR$/../../../../../../thirdparty/hibernate/lib/hibernate3.jar!/" />
+ </CLASSES>
+ <JAVADOC />
+ <SOURCES />
+ </library>
+ </orderEntry>
<orderEntryProperties />
<javadoc-paths>
<root url="http://java.sun.com/j2ee/1.4/docs/api/" />
Modified: trunk/cms/src/main/org/jboss/portal/cms/search/CMSFederatedSearch.java
===================================================================
--- trunk/cms/src/main/org/jboss/portal/cms/search/CMSFederatedSearch.java 2007-02-23 19:21:29 UTC (rev 6386)
+++ trunk/cms/src/main/org/jboss/portal/cms/search/CMSFederatedSearch.java 2007-02-23 23:07:37 UTC (rev 6387)
@@ -22,12 +22,6 @@
******************************************************************************/
package org.jboss.portal.cms.search;
-import java.util.Iterator;
-import java.util.List;
-import java.util.Locale;
-
-import javax.portlet.Portlet;
-
import org.jboss.portal.cms.CMS;
import org.jboss.portal.cms.Command;
import org.jboss.portal.cms.model.File;
@@ -37,6 +31,9 @@
import org.jboss.portal.search.query.Query;
import org.jboss.portal.search.result.ResultSet;
+import java.util.Iterator;
+import java.util.List;
+
/**
* @author <a href="mailto:theute@jboss.org">Thomas Heute</a>
* @version $Revision$
@@ -53,10 +50,10 @@
this.id = id;
info = new Info();
info.setStatus(Info.Status.AVAILABLE);
-
- this.urlPrefix = "portal/content";
+
+ this.urlPrefix = "portal/content";
}
-
+
public void setCMS(CMS cms)
{
this.cms = cms;
@@ -89,7 +86,7 @@
Command searchCommand = cms.getCommandFactory().createSearchCommand(query);
List files = (List)cms.execute(searchCommand);
ResultSet results = new ResultSet(this);
-
+
Iterator it = files.iterator();
while (it.hasNext())
{
Modified: trunk/core-cms/src/main/org/jboss/portal/core/cms/content/CMSFaceletContentEditor.java
===================================================================
--- trunk/core-cms/src/main/org/jboss/portal/core/cms/content/CMSFaceletContentEditor.java 2007-02-23 19:21:29 UTC (rev 6386)
+++ trunk/core-cms/src/main/org/jboss/portal/core/cms/content/CMSFaceletContentEditor.java 2007-02-23 23:07:37 UTC (rev 6387)
@@ -1,6 +1,6 @@
/******************************************************************************
* JBoss, a division of Red Hat *
- * Copyright 2006, Red Hat Middleware, LLC, and individual *
+ * Copyright 2007, 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. *
@@ -22,15 +22,15 @@
******************************************************************************/
package org.jboss.portal.core.cms.content;
-import org.jboss.portal.core.portlet.management.content.AbstractFaceletContentEditor;
import org.jboss.portal.cms.CMS;
import org.jboss.portal.cms.Command;
+import org.jboss.portal.cms.model.File;
import org.jboss.portal.cms.model.Folder;
-import org.jboss.portal.cms.model.File;
+import org.jboss.portal.core.portlet.management.content.AbstractFaceletContentEditor;
import javax.faces.model.SelectItem;
+import java.util.ArrayList;
import java.util.List;
-import java.util.ArrayList;
/**
* @author <a href="mailto:julien@jboss.org">Julien Viet</a>
19 years, 2 months
- 1
- 0
JBoss Portal SVN: r6386 - trunk/wsrp/src/main/org/jboss/portal/wsrp/producer.
by portal-commits＠lists.jboss.org
Author: chris.laprun(a)jboss.com
Date: 2007-02-23 14:21:29 -0500 (Fri, 23 Feb 2007)
New Revision: 6386
Modified:
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupHandler.java
trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java
Log:
- JBPORTAL-1220: force call to initCookie for BEA version < 9.2 to behave properly as a consumer.
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupHandler.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupHandler.java 2007-02-23 19:16:55 UTC (rev 6385)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/MarkupHandler.java 2007-02-23 19:21:29 UTC (rev 6386)
@@ -56,6 +56,7 @@
import org.jboss.portal.wsrp.core.UnsupportedWindowStateFault;
import org.jboss.portal.wsrp.core.UploadContext;
import org.jboss.portal.wsrp.core.WSRP_v1_Markup_PortType;
+import org.jboss.portal.wsrp.servlet.ServletAccess;
import javax.portlet.PortletModeException;
import javax.portlet.WindowStateException;
@@ -87,7 +88,6 @@
OperationFailedFault, MissingParametersFault, InvalidUserCategoryFault, InvalidRegistrationFault,
UnsupportedMimeTypeFault, RemoteException
{
-
WSRPUtils.throwOperationFailedFaultIfValueIsMissing(getMarkup, GET_MARKUP);
RequestProcessor requestProcessor = new RenderRequestProcessor(producer, getMarkup);
@@ -164,7 +164,12 @@
WSRPUtils.throwOperationFailedFaultIfValueIsMissing(initCookie, "InitCookie");
producer.checkRegistration(initCookie.getRegistrationContext());
- return new ReturnAny(); // todo: implement when actually needed
+ // Force HTTP session creation... this is required for BEA Weblogic version < 9.2.
+ // See http://jira.jboss.com/jira/browse/JBPORTAL-1220
+ String sessionId = ServletAccess.getRequest().getSession().getId();
+ log.debug("Got init cookie operation, created a session with id " + sessionId);
+
+ return new ReturnAny();
}
static void throwOperationFaultOnSessionOperation() throws OperationFailedFault
Modified: trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java
===================================================================
--- trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2007-02-23 19:16:55 UTC (rev 6385)
+++ trunk/wsrp/src/main/org/jboss/portal/wsrp/producer/ServiceDescriptionHandler.java 2007-02-23 19:21:29 UTC (rev 6386)
@@ -67,6 +67,9 @@
private final Logger log = Logger.getLogger(getClass());
+ // JBPORTAL-1220: force call to initCookie... Required so that BEA version < 9.2 will behave properly as a Consumer
+ private final CookieProtocol BEA_8_CONSUMER_FIX = CookieProtocol.perUser;
+
ServiceDescriptionHandler(WSRPProducerImpl producer)
{
super(producer);
@@ -138,7 +141,7 @@
ProducerRegistrationRequirements requirements = producer.getProducerRegistrationRequirements();
// should we be sending the registration properties description as well?
ServiceDescription serviceDescription = WSRPTypeFactory.createServiceDescription(requirements.requiresRegistration());
- serviceDescription.setRequiresInitCookie(CookieProtocol.none);
+ serviceDescription.setRequiresInitCookie(BEA_8_CONSUMER_FIX);
PortletDescription[] descriptions = getPortletDescriptions(desiredLocales);
serviceDescription.setOfferedPortlets(descriptions);
return serviceDescription;
@@ -177,7 +180,7 @@
description = WSRPUtils.convertRegistrationPropertiesToModelDescription(info);
}
- return new ServiceDescription(true, offeredPortlets, null, null, null, null, CookieProtocol.none,
+ return new ServiceDescription(true, offeredPortlets, null, null, null, null, BEA_8_CONSUMER_FIX,
description, producer.getSupportedLocales(), null, null);
}
19 years, 2 months
- 1
- 0