[jboss-svn-commits] JBoss Portal SVN: r5442 - in trunk/bridge: . src/main/org/jboss/portal/bridge
jboss-svn-commits at lists.jboss.org
jboss-svn-commits at lists.jboss.org
Fri Oct 13 13:35:12 EDT 2006
Author: chris.laprun at jboss.com
Date: 2006-10-13 13:35:09 -0400 (Fri, 13 Oct 2006)
New Revision: 5442
Modified:
trunk/bridge/build.xml
trunk/bridge/src/main/org/jboss/portal/bridge/BridgeInterceptor.java
trunk/bridge/src/main/org/jboss/portal/bridge/BridgeRequest.java
trunk/bridge/src/main/org/jboss/portal/bridge/BridgeResponse.java
trunk/bridge/src/main/org/jboss/portal/bridge/JBossServletContextProvider.java
Log:
JBPORTAL-1084: updated headers.
Modified: trunk/bridge/build.xml
===================================================================
--- trunk/bridge/build.xml 2006-10-13 17:25:44 UTC (rev 5441)
+++ trunk/bridge/build.xml 2006-10-13 17:35:09 UTC (rev 5442)
@@ -1,12 +1,35 @@
<?xml version="1.0" encoding="UTF-8"?>
+<!--~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
+ ~ 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. ~
+ ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~-->
+
<!DOCTYPE project [
<!ENTITY libraries SYSTEM "../thirdparty/libraries.ent">
<!ENTITY buildmagic SYSTEM "../tools/etc/buildfragments/buildmagic.ent">
- <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent">
+ <!ENTITY tools SYSTEM "../tools/etc/buildfragments/tools.ent">
<!ENTITY modules SYSTEM "../tools/etc/buildfragments/modules.ent">
<!ENTITY defaults SYSTEM "../tools/etc/buildfragments/defaults.ent">
<!ENTITY targets SYSTEM "../tools/etc/buildfragments/targets.ent">
-]>
+ ]>
<!-- $Id$ -->
@@ -32,7 +55,7 @@
<!--+====================================================================+-->
&buildmagic;
-
+
&modules;
&defaults;
&tools;
@@ -60,7 +83,7 @@
<target name="configure" unless="configure.disable">
<!-- Configure thirdparty libraries -->
- &libraries;
+ &libraries;
<path id="library.classpath">
<path refid="jbossas/core.libs.classpath"/>
<path refid="apache.log4j.classpath"/>
@@ -107,8 +130,8 @@
<!--+====================================================================+-->
<target name="compile"
- description="Compile all source files."
- depends="_default:compile-classes,
+ description="Compile all source files."
+ depends="_default:compile-classes,
_default:compile-etc,
_default:compile-resources">
<!-- Add module specific elements here. -->
@@ -123,12 +146,12 @@
<!--+====================================================================+-->
<target name="output"
- description="Generate all target output."
- depends="compile">
+ description="Generate all target output."
+ depends="compile">
<mkdir dir="${build.lib}"/>
- <jar jarfile="${build.lib}/portal-bridge-lib.jar" > <!-- manifest="${build.etc}/portal-cms-lib-jar.mf" -->
+ <jar jarfile="${build.lib}/portal-bridge-lib.jar"> <!-- manifest="${build.etc}/portal-cms-lib-jar.mf" -->
<fileset dir="${build.classes}"/>
</jar>
Modified: trunk/bridge/src/main/org/jboss/portal/bridge/BridgeInterceptor.java
===================================================================
--- trunk/bridge/src/main/org/jboss/portal/bridge/BridgeInterceptor.java 2006-10-13 17:25:44 UTC (rev 5441)
+++ trunk/bridge/src/main/org/jboss/portal/bridge/BridgeInterceptor.java 2006-10-13 17:35:09 UTC (rev 5442)
@@ -1,24 +1,25 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., 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, 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.bridge;
import org.jboss.portal.portlet.invocation.PortletInterceptor;
Modified: trunk/bridge/src/main/org/jboss/portal/bridge/BridgeRequest.java
===================================================================
--- trunk/bridge/src/main/org/jboss/portal/bridge/BridgeRequest.java 2006-10-13 17:25:44 UTC (rev 5441)
+++ trunk/bridge/src/main/org/jboss/portal/bridge/BridgeRequest.java 2006-10-13 17:35:09 UTC (rev 5442)
@@ -1,26 +1,36 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., 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, 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.bridge;
+import org.jboss.portal.portlet.impl.spi.AbstractRequestContext;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+
+import javax.portlet.PortletRequest;
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletInputStream;
+import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpSession;
import java.io.BufferedReader;
import java.io.IOException;
import java.io.UnsupportedEncodingException;
@@ -29,16 +39,6 @@
import java.util.Locale;
import java.util.Map;
-import javax.portlet.PortletRequest;
-import javax.servlet.RequestDispatcher;
-import javax.servlet.ServletInputStream;
-import javax.servlet.http.Cookie;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpSession;
-
-import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.impl.spi.AbstractRequestContext;
-
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @version $Revision$
Modified: trunk/bridge/src/main/org/jboss/portal/bridge/BridgeResponse.java
===================================================================
--- trunk/bridge/src/main/org/jboss/portal/bridge/BridgeResponse.java 2006-10-13 17:25:44 UTC (rev 5441)
+++ trunk/bridge/src/main/org/jboss/portal/bridge/BridgeResponse.java 2006-10-13 17:35:09 UTC (rev 5442)
@@ -1,41 +1,41 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., 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, 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.bridge;
-import java.io.IOException;
-import java.io.OutputStream;
-import java.io.PrintWriter;
-import java.util.Locale;
+import org.jboss.portal.portlet.impl.spi.AbstractRequestContext;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
+import javax.portlet.PortletResponse;
import javax.portlet.RenderResponse;
-import javax.portlet.PortletResponse;
import javax.servlet.ServletOutputStream;
import javax.servlet.http.Cookie;
+import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-import javax.servlet.http.HttpServletRequest;
+import java.io.IOException;
+import java.io.OutputStream;
+import java.io.PrintWriter;
+import java.util.Locale;
-import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.impl.spi.AbstractRequestContext;
-
/**
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
* @version $Revision$
@@ -146,14 +146,17 @@
sos = new ServletOutputStream()
{
private OutputStream out = ((RenderResponse)presp).getPortletOutputStream();
+
public void write(byte b[], int off, int len) throws IOException
{
out.write(b, off, len);
}
+
public void write(byte b[]) throws IOException
{
out.write(b);
}
+
public void write(int b) throws IOException
{
out.write(b);
Modified: trunk/bridge/src/main/org/jboss/portal/bridge/JBossServletContextProvider.java
===================================================================
--- trunk/bridge/src/main/org/jboss/portal/bridge/JBossServletContextProvider.java 2006-10-13 17:25:44 UTC (rev 5441)
+++ trunk/bridge/src/main/org/jboss/portal/bridge/JBossServletContextProvider.java 2006-10-13 17:35:09 UTC (rev 5442)
@@ -1,40 +1,41 @@
-/*
-* JBoss, Home of Professional Open Source
-* Copyright 2005, JBoss Inc., 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, 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.bridge;
import org.apache.portals.bridges.common.ServletContextProvider;
-import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.container.info.ContainerPortletInfo;
+import org.jboss.portal.portlet.invocation.PortletInvocation;
-import javax.servlet.ServletContext;
-import javax.servlet.http.HttpServletRequest;
-import javax.servlet.http.HttpServletResponse;
import javax.portlet.GenericPortlet;
import javax.portlet.PortletRequest;
import javax.portlet.PortletResponse;
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
/**
- * The JBoss implementation of <code>org.apache.portals.bridges.common.ServletContextProvider</code> use thread local variables
- * to keep the request associated with the current thread of execution.
+ * The JBoss implementation of <code>org.apache.portals.bridges.common.ServletContextProvider</code> use thread local
+ * variables to keep the request associated with the current thread of execution.
*
* @author <a href="mailto:dr at vizuri.com">Swarn Dhaliwal</a>
* @author <a href="mailto:julien at jboss.org">Julien Viet</a>
@@ -55,9 +56,7 @@
return (BridgeInfo)local.get();
}
- /**
- * @throws IllegalStateException if no bridge info is found
- */
+ /** @throws IllegalStateException if no bridge info is found */
public ServletContext getServletContext(GenericPortlet genericPortlet) throws IllegalStateException
{
BridgeInfo info = ((BridgeInfo)local.get());
@@ -68,9 +67,7 @@
return info.ctx;
}
- /**
- * @throws IllegalStateException if no bridge info is found
- */
+ /** @throws IllegalStateException if no bridge info is found */
public HttpServletRequest getHttpServletRequest(GenericPortlet genericPortlet, PortletRequest portletRequest) throws IllegalStateException
{
BridgeInfo info = (BridgeInfo)JBossServletContextProvider.local.get();
@@ -85,9 +82,7 @@
return info.breq;
}
- /**
- * @throws IllegalStateException if no bridge info is found
- */
+ /** @throws IllegalStateException if no bridge info is found */
public HttpServletResponse getHttpServletResponse(GenericPortlet genericPortlet, PortletResponse portletResponse) throws IllegalStateException
{
BridgeInfo info = (BridgeInfo)JBossServletContextProvider.local.get();
@@ -102,9 +97,7 @@
return info.bresp;
}
- /**
- * Lazy initialisation of the bridge info.
- */
+ /** Lazy initialisation of the bridge info. */
private void init(BridgeInfo bridgeInfo)
{
bridgeInfo.breq = new BridgeRequest(bridgeInfo);
More information about the jboss-svn-commits
mailing list