Menu
▾
▴
jboss-cvs-commits — CVS commits for JBoss
You can subscribe to this list here.
| 2002 |
Jan
|
Feb
|
Mar
|
Apr
(544) |
May
(1715) |
Jun
(1059) |
Jul
(886) |
Aug
(1214) |
Sep
(1375) |
Oct
(1664) |
Nov
(1153) |
Dec
(1084) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2003 |
Jan
(1630) |
Feb
(1634) |
Mar
(1979) |
Apr
(1119) |
May
(1850) |
Jun
(1231) |
Jul
(1168) |
Aug
(1840) |
Sep
(1038) |
Oct
(1127) |
Nov
(1458) |
Dec
(854) |
| 2004 |
Jan
(1145) |
Feb
(1064) |
Mar
(2242) |
Apr
(1728) |
May
(1346) |
Jun
(1280) |
Jul
(1681) |
Aug
(2388) |
Sep
(2233) |
Oct
(3246) |
Nov
(3248) |
Dec
(1775) |
| 2005 |
Jan
(3407) |
Feb
(3049) |
Mar
(2402) |
Apr
(3687) |
May
(3289) |
Jun
(5731) |
Jul
(3905) |
Aug
(5843) |
Sep
(5149) |
Oct
(6866) |
Nov
(4051) |
Dec
(4646) |
| 2006 |
Jan
(7356) |
Feb
(4713) |
Mar
(9447) |
Apr
(6553) |
May
(6206) |
Jun
(4301) |
Jul
(1160) |
Aug
(23) |
Sep
(11) |
Oct
(19) |
Nov
(26) |
Dec
(15) |
| 2007 |
Jan
(28) |
Feb
(24) |
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 12:04:18
|
User: julien
Date: 06/07/09 08:04:16
Modified: portlet/src/main/org/jboss/portal/portlet/deployment
PortletApplicationMetaDataFactory.java
Log:
move Mode and WindowState to org.jboss.portal.portlet instead of org.jboss.portal
Revision Changes Path
1.9 +2 -2 jboss-portal/portlet/src/main/org/jboss/portal/portlet/deployment/PortletApplicationMetaDataFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PortletApplicationMetaDataFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/deployment/PortletApplicationMetaDataFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- PortletApplicationMetaDataFactory.java 7 Jul 2006 12:23:49 -0000 1.8
+++ PortletApplicationMetaDataFactory.java 9 Jul 2006 12:04:16 -0000 1.9
@@ -38,9 +38,9 @@
import org.jboss.portal.portlet.impl.jsr168.metadata.DescriptionMetaData;
import org.jboss.portal.portlet.impl.jsr168.metadata.TransportGuaranteesMetaData;
import org.jboss.portal.portlet.impl.jsr168.metadata.SecurityConstraintMetaData;
+import org.jboss.portal.portlet.Mode;
import org.jboss.portal.common.util.LocaleInfo;
import org.jboss.portal.common.util.Tools;
-import org.jboss.portal.Mode;
import org.jboss.portal.server.util.TransportGuarantee;
import org.xml.sax.Attributes;
@@ -50,7 +50,7 @@
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class PortletApplicationMetaDataFactory implements GenericObjectModelFactory
{
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 12:04:18
|
User: julien
Date: 06/07/09 08:04:16
Modified: portlet/src/main/org/jboss/portal/portlet/container/info
ContainerCapabilities.java ContainerModeInfo.java
ContainerWindowStateInfo.java ContentTypes.java
Log:
move Mode and WindowState to org.jboss.portal.portlet instead of org.jboss.portal
Revision Changes Path
1.3 +3 -3 jboss-portal/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCapabilities.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ContainerCapabilities.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerCapabilities.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ContainerCapabilities.java 26 Jun 2006 14:05:39 -0000 1.2
+++ ContainerCapabilities.java 9 Jul 2006 12:04:16 -0000 1.3
@@ -21,8 +21,8 @@
*/
package org.jboss.portal.portlet.container.info;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.Mode;
+import org.jboss.portal.portlet.WindowState;
import org.jboss.portal.portlet.info.CapabilitiesInfo;
import java.util.HashSet;
@@ -32,7 +32,7 @@
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
* @author <a href="mailto:chr...@jb...">Chris Laprun</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class ContainerCapabilities implements CapabilitiesInfo
{
1.2 +2 -2 jboss-portal/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerModeInfo.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ContainerModeInfo.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerModeInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ContainerModeInfo.java 5 Apr 2006 17:14:01 -0000 1.1
+++ ContainerModeInfo.java 9 Jul 2006 12:04:16 -0000 1.2
@@ -22,7 +22,7 @@
package org.jboss.portal.portlet.container.info;
-import org.jboss.portal.Mode;
+import org.jboss.portal.portlet.Mode;
import org.jboss.portal.common.util.LocalizedString;
import org.jboss.portal.portlet.info.ModeInfo;
@@ -30,7 +30,7 @@
/**
* @author <a href="mailto:chr...@jb...">Chris Laprun</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @since 2.4
*/
class ContainerModeInfo implements ModeInfo
1.2 +2 -2 jboss-portal/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerWindowStateInfo.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ContainerWindowStateInfo.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/container/info/ContainerWindowStateInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ContainerWindowStateInfo.java 5 Apr 2006 17:14:01 -0000 1.1
+++ ContainerWindowStateInfo.java 9 Jul 2006 12:04:16 -0000 1.2
@@ -22,7 +22,7 @@
package org.jboss.portal.portlet.container.info;
-import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.WindowState;
import org.jboss.portal.common.util.LocalizedString;
import org.jboss.portal.portlet.info.WindowStateInfo;
@@ -30,7 +30,7 @@
/**
* @author <a href="mailto:chr...@jb...">Chris Laprun</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
* @since 2.4
*/
class ContainerWindowStateInfo implements WindowStateInfo
1.3 +2 -2 jboss-portal/portlet/src/main/org/jboss/portal/portlet/container/info/ContentTypes.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ContentTypes.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/container/info/ContentTypes.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ContentTypes.java 3 May 2006 21:00:13 -0000 1.2
+++ ContentTypes.java 9 Jul 2006 12:04:16 -0000 1.3
@@ -21,7 +21,7 @@
*/
package org.jboss.portal.portlet.container.info;
-import org.jboss.portal.Mode;
+import org.jboss.portal.portlet.Mode;
import org.jboss.portal.portlet.impl.jsr168.metadata.ContentTypeMetaData;
import org.jboss.portal.portlet.impl.jsr168.metadata.ContentTypesMetaData;
@@ -40,7 +40,7 @@
*
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
* @author <a href="mailto:chr...@jb...">Chris Laprun</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class ContentTypes
{
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 12:04:18
|
User: julien
Date: 06/07/09 08:04:16
Modified: portlet/src/main/org/jboss/portal/portlet/impl/jsr168
ActionResponseImpl.java PortalContextImpl.java
PortletRequestImpl.java PortletURLImpl.java
Log:
move Mode and WindowState to org.jboss.portal.portlet instead of org.jboss.portal
Revision Changes Path
1.8 +3 -3 jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionResponseImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ActionResponseImpl.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/ActionResponseImpl.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -b -r1.7 -r1.8
--- ActionResponseImpl.java 26 May 2006 19:59:24 -0000 1.7
+++ ActionResponseImpl.java 9 Jul 2006 12:04:16 -0000 1.8
@@ -22,7 +22,7 @@
package org.jboss.portal.portlet.impl.jsr168;
import org.apache.log4j.Logger;
-import org.jboss.portal.Mode;
+import org.jboss.portal.portlet.Mode;
import org.jboss.portal.server.util.Properties;
import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.portlet.result.HTTPRedirectionResult;
@@ -41,7 +41,7 @@
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.7 $
+ * @version $Revision: 1.8 $
*/
public class ActionResponseImpl extends PortletResponseImpl implements ActionResponse
{
@@ -82,7 +82,7 @@
{
throw new WindowStateException("Not supported", windowState);
}
- ((RenderResult)result).setWindowState(org.jboss.portal.WindowState.create(windowState.toString()));
+ ((RenderResult)result).setWindowState(org.jboss.portal.portlet.WindowState.create(windowState.toString()));
decision = WANT_RENDER;
}
else
1.7 +3 -3 jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortalContextImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PortalContextImpl.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortalContextImpl.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- PortalContextImpl.java 7 Jun 2006 17:34:19 -0000 1.6
+++ PortalContextImpl.java 9 Jul 2006 12:04:16 -0000 1.7
@@ -21,7 +21,7 @@
*/
package org.jboss.portal.portlet.impl.jsr168;
-import org.jboss.portal.Mode;
+import org.jboss.portal.portlet.Mode;
import org.jboss.portal.common.util.Tools;
import org.jboss.portal.portlet.spi.PortalContext;
import org.jboss.portal.server.PortalConstants;
@@ -36,7 +36,7 @@
* todo : does not provide customizable values for portlet modes and window states.
*
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.6 $
+ * @version $Revision: 1.7 $
*/
public class PortalContextImpl implements javax.portlet.PortalContext
{
@@ -98,7 +98,7 @@
supportedWindowStates = new HashSet(tmp.size());
for (Iterator i = tmp.iterator(); i.hasNext();)
{
- org.jboss.portal.WindowState windowState = (org.jboss.portal.WindowState)i.next();
+ org.jboss.portal.portlet.WindowState windowState = (org.jboss.portal.portlet.WindowState)i.next();
supportedWindowStates.add(PortletURLImpl.decodeWindowState(windowState.toString()));
}
}
1.31 +3 -3 jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PortletRequestImpl.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletRequestImpl.java,v
retrieving revision 1.30
retrieving revision 1.31
diff -u -b -r1.30 -r1.31
--- PortletRequestImpl.java 6 Jul 2006 12:50:17 -0000 1.30
+++ PortletRequestImpl.java 9 Jul 2006 12:04:16 -0000 1.31
@@ -63,7 +63,7 @@
*
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
* @author <a href="mailto:bol...@jb...">Boleslaw Dawidowicz</a>
- * @version $Revision: 1.30 $
+ * @version $Revision: 1.31 $
*/
public abstract class PortletRequestImpl implements PortletRequest
{
@@ -413,7 +413,7 @@
}
else
{
- return invocation.getSupportedModes().contains(org.jboss.portal.Mode.create(portletMode.toString()));
+ return invocation.getSupportedModes().contains(org.jboss.portal.portlet.Mode.create(portletMode.toString()));
}
}
@@ -421,7 +421,7 @@
public boolean isWindowStateAllowed(WindowState windowState)
{
- return invocation.getSupportedWindowStates().contains(org.jboss.portal.WindowState.create(windowState.toString()));
+ return invocation.getSupportedWindowStates().contains(org.jboss.portal.portlet.WindowState.create(windowState.toString()));
}
//
1.9 +4 -4 jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PortletURLImpl.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/PortletURLImpl.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- PortletURLImpl.java 7 Jun 2006 17:34:19 -0000 1.8
+++ PortletURLImpl.java 9 Jul 2006 12:04:16 -0000 1.9
@@ -38,11 +38,11 @@
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.spi.InvocationContext;
import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.Mode;
+import org.jboss.portal.portlet.Mode;
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.8 $
+ * @version $Revision: 1.9 $
*/
public class PortletURLImpl implements PortletURL
{
@@ -221,11 +221,11 @@
return null;
}
- public org.jboss.portal.WindowState getWindowState()
+ public org.jboss.portal.portlet.WindowState getWindowState()
{
if (windowState != null)
{
- return org.jboss.portal.WindowState.create(windowState.toString());
+ return org.jboss.portal.portlet.WindowState.create(windowState.toString());
}
return null;
}
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 12:04:18
|
User: julien
Date: 06/07/09 08:04:16
Modified: portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata
ContentTypeMetaData.java
Log:
move Mode and WindowState to org.jboss.portal.portlet instead of org.jboss.portal
Revision Changes Path
1.2 +2 -2 jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ContentTypeMetaData.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ContentTypeMetaData.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/impl/jsr168/metadata/ContentTypeMetaData.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ContentTypeMetaData.java 3 May 2006 21:00:13 -0000 1.1
+++ ContentTypeMetaData.java 9 Jul 2006 12:04:16 -0000 1.2
@@ -21,7 +21,7 @@
*/
package org.jboss.portal.portlet.impl.jsr168.metadata;
-import org.jboss.portal.Mode;
+import org.jboss.portal.portlet.Mode;
import org.jboss.portal.common.util.Tools;
import java.util.Set;
@@ -29,7 +29,7 @@
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class ContentTypeMetaData
{
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 12:04:17
|
User: julien
Date: 06/07/09 08:04:15
Modified: portlet/src/main/org/jboss/portal/portlet
PortletRequestDecoder.java PortletURL.java
Added: portlet/src/main/org/jboss/portal/portlet Mode.java
WindowState.java
Log:
move Mode and WindowState to org.jboss.portal.portlet instead of org.jboss.portal
Revision Changes Path
1.2 +0 -2 jboss-portal/portlet/src/main/org/jboss/portal/portlet/PortletRequestDecoder.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PortletRequestDecoder.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/PortletRequestDecoder.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- PortletRequestDecoder.java 22 Jun 2006 02:11:13 -0000 1.1
+++ PortletRequestDecoder.java 9 Jul 2006 12:04:15 -0000 1.2
@@ -23,8 +23,6 @@
import org.jboss.portal.server.util.Parameters;
import org.jboss.portal.server.request.RequestParameter;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
import java.util.Iterator;
import java.util.Map;
@@ -34,7 +32,7 @@
* Which means that this implementation does not preclude other implementations.
*
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class PortletRequestDecoder
{
1.5 +1 -4 jboss-portal/portlet/src/main/org/jboss/portal/portlet/PortletURL.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PortletURL.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/PortletURL.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PortletURL.java 23 Jun 2006 16:17:26 -0000 1.4
+++ PortletURL.java 9 Jul 2006 12:04:15 -0000 1.5
@@ -21,12 +21,9 @@
*/
package org.jboss.portal.portlet;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
-
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public interface PortletURL
{
1.1 date: 2006/07/09 12:04:15; author: julien; state: Exp;jboss-portal/portlet/src/main/org/jboss/portal/portlet/Mode.java
Index: Mode.java
===================================================================
/*
* 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.
*/
package org.jboss.portal.portlet;
import java.io.Serializable;
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
* @version $Revision: 1.1 $
*/
public class Mode implements Serializable
{
/** The serialVersionUID. */
private static final long serialVersionUID = 6033765240710422050L;
/** . */
public static final Mode EDIT = new Mode("edit");
/** . */
public static final Mode HELP = new Mode("help");
/** . */
public static final Mode VIEW = new Mode("view");
/** . */
public static final Mode EDIT_DEFAULTS = new Mode("edit_defaults");
/** . */
private String name;
public Mode(String name)
{
if (name == null)
{
throw new NullPointerException();
}
this.name = name;
}
public boolean equals(Object o)
{
if (o instanceof Mode)
{
return o == this || name.equalsIgnoreCase(((Mode)o).name);
}
return false;
}
public int hashCode()
{
return name.hashCode();
}
public String toString()
{
return name;
}
private Object readResolve()
{
if (VIEW.name.equalsIgnoreCase(name))
{
return VIEW;
}
else if (EDIT.name.equalsIgnoreCase(name))
{
return EDIT;
}
else if (HELP.name.equalsIgnoreCase(name))
{
return HELP;
}
else if (EDIT_DEFAULTS.name.equalsIgnoreCase(name))
{
return EDIT_DEFAULTS;
}
else
{
return this;
}
}
public static Mode create(String s)
{
if (Mode.VIEW.name.equalsIgnoreCase(s))
{
return Mode.VIEW;
}
else if (Mode.EDIT.name.equalsIgnoreCase(s))
{
return Mode.EDIT;
}
else if (Mode.HELP.name.equalsIgnoreCase(s))
{
return Mode.HELP;
}
else if (Mode.EDIT_DEFAULTS.name.equalsIgnoreCase(s))
{
return Mode.VIEW;
}
else
{
return new Mode(s);
}
}
}
1.1 date: 2006/07/09 12:04:15; author: julien; state: Exp;jboss-portal/portlet/src/main/org/jboss/portal/portlet/WindowState.java
Index: WindowState.java
===================================================================
/*
* 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.
*/
package org.jboss.portal.portlet;
import java.io.Serializable;
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
* @version $Revision: 1.1 $
*/
public class WindowState implements Serializable
{
/** The serialVersionUID */
private static final long serialVersionUID = -6305311518934458562L;
public static final WindowState NORMAL = new WindowState("normal");
public static final WindowState MINIMIZED = new WindowState("minimized");
public static final WindowState MAXIMIZED = new WindowState("maximized");
private String name;
public WindowState(String name)
{
if (name == null)
{
throw new IllegalArgumentException("Window state name cannot be null.");
}
this.name = name;
}
public boolean equals(Object o)
{
if (o instanceof WindowState)
{
return o == this || name.equalsIgnoreCase(((WindowState)o).name);
}
return false;
}
public int hashCode()
{
return name.hashCode();
}
public String toString()
{
return name;
}
private Object readResolve()
{
if (NORMAL.name.equalsIgnoreCase(name))
{
return NORMAL;
}
else if (MAXIMIZED.name.equalsIgnoreCase(name))
{
return MAXIMIZED;
}
else if (MINIMIZED.name.equalsIgnoreCase(name))
{
return MINIMIZED;
}
else
{
return this;
}
}
public static WindowState create(String s)
{
if (WindowState.NORMAL.toString().equalsIgnoreCase(s))
{
return WindowState.NORMAL;
}
else if (WindowState.MINIMIZED.toString().equalsIgnoreCase(s))
{
return WindowState.MINIMIZED;
}
else if (WindowState.MAXIMIZED.toString().equalsIgnoreCase(s))
{
return WindowState.MAXIMIZED;
}
else
{
return new WindowState(s);
}
}
}
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 12:04:17
|
User: julien
Date: 06/07/09 08:04:16
Modified: portlet/src/main/org/jboss/portal/portlet/aspects/portlet
ConsumerCacheInterceptor.java
Log:
move Mode and WindowState to org.jboss.portal.portlet instead of org.jboss.portal
Revision Changes Path
1.2 +2 -2 jboss-portal/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ConsumerCacheInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/portlet/src/main/org/jboss/portal/portlet/aspects/portlet/ConsumerCacheInterceptor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- ConsumerCacheInterceptor.java 18 Jun 2006 03:25:09 -0000 1.1
+++ ConsumerCacheInterceptor.java 9 Jul 2006 12:04:16 -0000 1.2
@@ -31,13 +31,13 @@
import org.jboss.portal.portlet.result.cache.StrongTimedContent;
import org.jboss.portal.portlet.spi.InvocationContext;
import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.Mode;
import org.jboss.portal.common.invocation.InvocationException;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.Mode;
+import org.jboss.portal.portlet.WindowState;
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.1 $
+ * @version $Revision: 1.2 $
*/
public class ConsumerCacheInterceptor extends PortletInterceptor
{
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 12:04:17
|
User: julien
Date: 06/07/09 08:04:14
Modified: core/src/main/org/jboss/portal/core/cms
CMSObjectCommandFactory.java
Log:
move Mode and WindowState to org.jboss.portal.portlet instead of org.jboss.portal
Revision Changes Path
1.9 +1 -1 jboss-portal/core/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CMSObjectCommandFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/cms/CMSObjectCommandFactory.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -b -r1.8 -r1.9
--- CMSObjectCommandFactory.java 26 May 2006 20:12:06 -0000 1.8
+++ CMSObjectCommandFactory.java 9 Jul 2006 12:04:14 -0000 1.9
@@ -21,7 +21,7 @@
*/
package org.jboss.portal.core.cms;
-import org.jboss.portal.Mode;
+import org.jboss.portal.portlet.Mode;
import org.jboss.portal.portlet.ParametersStateString;
import org.jboss.portal.cms.CMS;
import org.jboss.portal.cms.Command;
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 12:04:17
|
User: julien
Date: 06/07/09 08:04:14
Modified: core/src/main/org/jboss/portal/core/aspects/controller
PageNavigationInterceptor.java
Log:
move Mode and WindowState to org.jboss.portal.portlet instead of org.jboss.portal
Revision Changes Path
1.15 +3 -3 jboss-portal/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PageNavigationInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/aspects/controller/PageNavigationInterceptor.java,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -b -r1.14 -r1.15
--- PageNavigationInterceptor.java 27 May 2006 15:21:21 -0000 1.14
+++ PageNavigationInterceptor.java 9 Jul 2006 12:04:14 -0000 1.15
@@ -1,8 +1,8 @@
package org.jboss.portal.core.aspects.controller;
import org.apache.log4j.Logger;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.Mode;
+import org.jboss.portal.portlet.WindowState;
import org.jboss.portal.common.invocation.InvocationException;
import org.jboss.portal.core.command.CommandContext;
import org.jboss.portal.core.command.CommandInterceptor;
@@ -41,7 +41,7 @@
* Ensure that the page navigational state holder is present.
*
* @author <a href="mailto:mho...@no...">Martin Holzner</a>
- * @version $Revision: 1.14 $
+ * @version $Revision: 1.15 $
*/
public class PageNavigationInterceptor extends CommandInterceptor
{
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 12:04:17
|
User: julien
Date: 06/07/09 08:04:15
Modified: core/src/main/org/jboss/portal/test/core/model/instance
InstanceContainerTestCase.java
Log:
move Mode and WindowState to org.jboss.portal.portlet instead of org.jboss.portal
Revision Changes Path
1.11 +2 -20 jboss-portal/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InstanceContainerTestCase.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/test/core/model/instance/InstanceContainerTestCase.java,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -b -r1.10 -r1.11
--- InstanceContainerTestCase.java 18 Jun 2006 23:23:13 -0000 1.10
+++ InstanceContainerTestCase.java 9 Jul 2006 12:04:15 -0000 1.11
@@ -11,48 +11,30 @@
import org.jboss.portal.core.impl.model.instance.PersistentInstanceContainer;
import org.jboss.portal.core.impl.portlet.state.PersistentStateStore;
import org.jboss.portal.core.model.instance.Instance;
-import org.jboss.portal.identity.db.UserImpl;
import org.jboss.portal.portlet.NoSuchPortletException;
-import org.jboss.portal.portlet.PortletInvokerException;
-import org.jboss.portal.portlet.StateString;
-import org.jboss.portal.portlet.PortletURL;
+import org.jboss.portal.portlet.Mode;
import org.jboss.portal.portlet.support.spi.ActionContextSupport;
import org.jboss.portal.portlet.support.spi.UserContextSupport;
import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.portlet.invocation.PortletInvocation;
-import org.jboss.portal.portlet.spi.UserContext;
-import org.jboss.portal.portlet.spi.InstanceContext;
-import org.jboss.portal.portlet.spi.ActionContext;
import org.jboss.portal.portlet.state.producer.StatefulPortletInvoker;
-import org.jboss.portal.portlet.state.AccessMode;
import org.jboss.portal.portlet.test.support.info.PortletInfoSupport;
import org.jboss.portal.security.impl.JBossAuthorizationDomainRegistryImpl;
import org.jboss.portal.security.impl.jacc.JACCPortalAuthorizationManagerFactory;
import org.jboss.portal.test.core.PortalBaseTestCase;
import org.jboss.portal.test.framework.embedded.DataSourceSupport;
-import org.jboss.portal.common.value.ValueMap;
import org.jboss.portal.common.value.SimpleValueMap;
-import org.jboss.portal.server.util.Parameters;
-import org.jboss.portal.server.util.HTTPStreamInfo;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
import java.lang.reflect.Method;
import java.lang.reflect.Modifier;
import java.net.URL;
-import java.util.List;
-import java.util.Locale;
-import java.util.Map;
-import java.io.BufferedReader;
-import java.io.IOException;
-import java.io.InputStream;
/**
* Test Case that tests the authorization for instances
* via the instance container
*
* @author <a href="mailto:Ani...@jb...">Anil Saldhana</a>
- * @version $Revision: 1.10 $
+ * @version $Revision: 1.11 $
* @since Apr 4, 2006
*/
public class InstanceContainerTestCase extends PortalBaseTestCase
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 12:04:16
|
User: julien
Date: 06/07/09 08:04:15
Modified: core/src/main/org/jboss/portal/core/portlet/test/event
PortletB.java
Log:
move Mode and WindowState to org.jboss.portal.portlet instead of org.jboss.portal
Revision Changes Path
1.5 +2 -2 jboss-portal/core/src/main/org/jboss/portal/core/portlet/test/event/PortletB.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PortletB.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/portlet/test/event/PortletB.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- PortletB.java 6 Jan 2006 23:48:26 -0000 1.4
+++ PortletB.java 9 Jul 2006 12:04:15 -0000 1.5
@@ -26,7 +26,7 @@
import org.jboss.portlet.event.node.PortalNodeEventBubbler;
import org.jboss.portlet.event.node.WindowActionEvent;
import org.jboss.portlet.PortalNode;
-import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.WindowState;
import javax.portlet.GenericPortlet;
import javax.portlet.RenderRequest;
@@ -40,7 +40,7 @@
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public class PortletB extends GenericPortlet
{
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 12:04:16
|
User: julien
Date: 06/07/09 08:04:15
Modified: core/src/main/org/jboss/portal/core/impl/model/instance
InstanceImpl.java
Log:
move Mode and WindowState to org.jboss.portal.portlet instead of org.jboss.portal
Revision Changes Path
1.28 +2 -2 jboss-portal/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InstanceImpl.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/impl/model/instance/InstanceImpl.java,v
retrieving revision 1.27
retrieving revision 1.28
diff -u -b -r1.27 -r1.28
--- InstanceImpl.java 18 Jun 2006 23:23:12 -0000 1.27
+++ InstanceImpl.java 9 Jul 2006 12:04:15 -0000 1.28
@@ -33,7 +33,7 @@
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.spi.UserContext;
import org.jboss.portal.portlet.state.AccessMode;
-import org.jboss.portal.Mode;
+import org.jboss.portal.portlet.Mode;
import java.util.HashMap;
import java.util.HashSet;
@@ -42,7 +42,7 @@
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.27 $
+ * @version $Revision: 1.28 $
*/
public class InstanceImpl implements Instance, ContextObject
{
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 12:04:16
|
User: julien
Date: 06/07/09 08:04:15
Modified: core/src/main/org/jboss/portal/core/model/portal
PortalObjectCommandFactory.java
Log:
move Mode and WindowState to org.jboss.portal.portlet instead of org.jboss.portal
Revision Changes Path
1.19 +3 -3 jboss-portal/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PortalObjectCommandFactory.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/model/portal/PortalObjectCommandFactory.java,v
retrieving revision 1.18
retrieving revision 1.19
diff -u -b -r1.18 -r1.19
--- PortalObjectCommandFactory.java 4 Jul 2006 10:07:50 -0000 1.18
+++ PortalObjectCommandFactory.java 9 Jul 2006 12:04:15 -0000 1.19
@@ -21,8 +21,8 @@
*/
package org.jboss.portal.core.model.portal;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.Mode;
+import org.jboss.portal.portlet.WindowState;
import org.jboss.portal.core.command.ControllerCommand;
import org.jboss.portal.core.command.InvokeWindowActionCommand;
import org.jboss.portal.core.command.InvokeWindowRenderCommand;
@@ -40,7 +40,7 @@
* This command mapper is used to map portal objects living in a container to <code>org.jboss.portal.core.command.RenderPageCommand</code>
*
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.18 $
+ * @version $Revision: 1.19 $
*/
public class PortalObjectCommandFactory extends CommandFactoryDelegate
{
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 12:04:16
|
User: julien
Date: 06/07/09 08:04:15
Modified: core/src/main/org/jboss/portal/core/metadata
PortalMetaData.java
Log:
move Mode and WindowState to org.jboss.portal.portlet instead of org.jboss.portal
Revision Changes Path
1.17 +3 -3 jboss-portal/core/src/main/org/jboss/portal/core/metadata/PortalMetaData.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: PortalMetaData.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/metadata/PortalMetaData.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -b -r1.16 -r1.17
--- PortalMetaData.java 22 May 2006 21:25:37 -0000 1.16
+++ PortalMetaData.java 9 Jul 2006 12:04:15 -0000 1.17
@@ -21,8 +21,8 @@
*/
package org.jboss.portal.core.metadata;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.Mode;
+import org.jboss.portal.portlet.WindowState;
import org.jboss.portal.common.util.XML;
import org.jboss.portal.core.model.portal.Context;
import org.jboss.portal.core.model.portal.Portal;
@@ -36,7 +36,7 @@
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.16 $
+ * @version $Revision: 1.17 $
*/
public class PortalMetaData extends PortalObjectMetaData
{
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 12:04:16
|
User: julien
Date: 06/07/09 08:04:14
Modified: core/src/main/org/jboss/portal/core/command
InvokeWindowActionCommand.java
InvokeWindowCommand.java
InvokeWindowRenderCommand.java MarkupCommand.java
RenderWindowCommand.java
Log:
move Mode and WindowState to org.jboss.portal.portlet instead of org.jboss.portal
Revision Changes Path
1.61 +3 -3 jboss-portal/core/src/main/org/jboss/portal/core/command/InvokeWindowActionCommand.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InvokeWindowActionCommand.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/command/InvokeWindowActionCommand.java,v
retrieving revision 1.60
retrieving revision 1.61
diff -u -b -r1.60 -r1.61
--- InvokeWindowActionCommand.java 4 Jul 2006 10:07:50 -0000 1.60
+++ InvokeWindowActionCommand.java 9 Jul 2006 12:04:14 -0000 1.61
@@ -22,8 +22,8 @@
package org.jboss.portal.core.command;
import org.jboss.logging.Logger;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.Mode;
+import org.jboss.portal.portlet.WindowState;
import org.jboss.portal.core.command.portlet.CoreActionContext;
import org.jboss.portal.core.output.SignOutResult;
import org.jboss.portal.portlet.StateString;
@@ -44,7 +44,7 @@
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.60 $
+ * @version $Revision: 1.61 $
*/
public class InvokeWindowActionCommand extends InvokeWindowCommand
{
1.5 +3 -3 jboss-portal/core/src/main/org/jboss/portal/core/command/InvokeWindowCommand.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InvokeWindowCommand.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/command/InvokeWindowCommand.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- InvokeWindowCommand.java 7 May 2006 13:57:06 -0000 1.4
+++ InvokeWindowCommand.java 9 Jul 2006 12:04:14 -0000 1.5
@@ -21,12 +21,12 @@
*/
package org.jboss.portal.core.command;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.Mode;
+import org.jboss.portal.portlet.WindowState;
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.4 $
+ * @version $Revision: 1.5 $
*/
public abstract class InvokeWindowCommand extends WindowCommand
{
1.38 +3 -3 jboss-portal/core/src/main/org/jboss/portal/core/command/InvokeWindowRenderCommand.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: InvokeWindowRenderCommand.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/command/InvokeWindowRenderCommand.java,v
retrieving revision 1.37
retrieving revision 1.38
diff -u -b -r1.37 -r1.38
--- InvokeWindowRenderCommand.java 7 May 2006 13:57:06 -0000 1.37
+++ InvokeWindowRenderCommand.java 9 Jul 2006 12:04:14 -0000 1.38
@@ -21,8 +21,8 @@
*/
package org.jboss.portal.core.command;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.Mode;
+import org.jboss.portal.portlet.WindowState;
import org.jboss.portal.portlet.StateString;
import org.jboss.portal.common.invocation.InvocationException;
import org.jboss.portal.core.aspects.controller.PageNavigationInterceptor;
@@ -33,7 +33,7 @@
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.37 $
+ * @version $Revision: 1.38 $
*/
public class InvokeWindowRenderCommand extends InvokeWindowCommand
{
1.32 +3 -3 jboss-portal/core/src/main/org/jboss/portal/core/command/MarkupCommand.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: MarkupCommand.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/command/MarkupCommand.java,v
retrieving revision 1.31
retrieving revision 1.32
diff -u -b -r1.31 -r1.32
--- MarkupCommand.java 4 Jul 2006 10:07:50 -0000 1.31
+++ MarkupCommand.java 9 Jul 2006 12:04:14 -0000 1.32
@@ -21,8 +21,8 @@
*/
package org.jboss.portal.core.command;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.Mode;
+import org.jboss.portal.portlet.WindowState;
import org.jboss.portal.identity.User;
import org.jboss.portal.security.spi.auth.PortalAuthorizationManager;
import org.jboss.portal.security.PortalSecurityException;
@@ -80,7 +80,7 @@
* RenderPageCommand and the RenderRegionCommand.</p>
*
* @author <a href="mailto:mho...@no...">Martin Holzner</a>
- * @version $Revision: 1.31 $
+ * @version $Revision: 1.32 $
*/
public abstract class MarkupCommand extends PortalObjectCommand
{
1.49 +3 -3 jboss-portal/core/src/main/org/jboss/portal/core/command/RenderWindowCommand.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: RenderWindowCommand.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/command/RenderWindowCommand.java,v
retrieving revision 1.48
retrieving revision 1.49
diff -u -b -r1.48 -r1.49
--- RenderWindowCommand.java 26 May 2006 14:12:52 -0000 1.48
+++ RenderWindowCommand.java 9 Jul 2006 12:04:14 -0000 1.49
@@ -31,14 +31,14 @@
import org.jboss.portal.portlet.result.Result;
import org.jboss.portal.portlet.invocation.RenderInvocation;
import org.jboss.portal.theme.navigation.WindowNavigationalState;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.Mode;
+import org.jboss.portal.portlet.WindowState;
/**
* Render a single window.
*
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.48 $
+ * @version $Revision: 1.49 $
*/
public class RenderWindowCommand extends WindowCommand
{
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 12:04:16
|
User: julien
Date: 06/07/09 08:04:14
Modified: core/src/main/org/jboss/portal/core/hibernate
ModeUserType.java WindowStateUserType.java
Log:
move Mode and WindowState to org.jboss.portal.portlet instead of org.jboss.portal
Revision Changes Path
1.3 +2 -2 jboss-portal/core/src/main/org/jboss/portal/core/hibernate/ModeUserType.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ModeUserType.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/hibernate/ModeUserType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- ModeUserType.java 6 Jan 2006 23:48:16 -0000 1.2
+++ ModeUserType.java 9 Jul 2006 12:04:14 -0000 1.3
@@ -21,12 +21,12 @@
*/
package org.jboss.portal.core.hibernate;
-import org.jboss.portal.Mode;
+import org.jboss.portal.portlet.Mode;
import org.jboss.portal.core.hibernate.StringWrapperUserType;
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class ModeUserType extends StringWrapperUserType
{
1.3 +2 -2 jboss-portal/core/src/main/org/jboss/portal/core/hibernate/WindowStateUserType.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: WindowStateUserType.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/hibernate/WindowStateUserType.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- WindowStateUserType.java 6 Jan 2006 23:48:16 -0000 1.2
+++ WindowStateUserType.java 9 Jul 2006 12:04:14 -0000 1.3
@@ -21,12 +21,12 @@
*/
package org.jboss.portal.core.hibernate;
-import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.WindowState;
import org.jboss.portal.core.hibernate.StringWrapperUserType;
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.2 $
+ * @version $Revision: 1.3 $
*/
public class WindowStateUserType extends StringWrapperUserType
{
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 12:04:16
|
User: julien
Date: 06/07/09 08:04:14
Modified: core/src/main/org/jboss/portal/core/command/portlet
CoreActionContext.java CoreInvocationContext.java
CoreRenderContext.java
Log:
move Mode and WindowState to org.jboss.portal.portlet instead of org.jboss.portal
Revision Changes Path
1.12 +3 -3 jboss-portal/core/src/main/org/jboss/portal/core/command/portlet/CoreActionContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CoreActionContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/command/portlet/CoreActionContext.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- CoreActionContext.java 7 May 2006 13:57:06 -0000 1.11
+++ CoreActionContext.java 9 Jul 2006 12:04:14 -0000 1.12
@@ -30,8 +30,8 @@
import org.jboss.portal.portlet.invocation.ActionInvocation;
import org.jboss.portal.server.ServerInvocation;
import org.jboss.portal.server.util.Parameters;
-import org.jboss.portal.WindowState;
-import org.jboss.portal.Mode;
+import org.jboss.portal.portlet.WindowState;
+import org.jboss.portal.portlet.Mode;
import javax.servlet.http.HttpServletRequest;
import java.io.BufferedReader;
@@ -40,7 +40,7 @@
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
public class CoreActionContext extends CoreInvocationContext implements ActionContext
{
1.23 +3 -3 jboss-portal/core/src/main/org/jboss/portal/core/command/portlet/CoreInvocationContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CoreInvocationContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/command/portlet/CoreInvocationContext.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -u -b -r1.22 -r1.23
--- CoreInvocationContext.java 4 Jul 2006 10:07:50 -0000 1.22
+++ CoreInvocationContext.java 9 Jul 2006 12:04:14 -0000 1.23
@@ -48,16 +48,16 @@
import org.jboss.portal.portlet.PortletURL;
import org.jboss.portal.portlet.ActionURL;
import org.jboss.portal.portlet.RenderURL;
+import org.jboss.portal.portlet.Mode;
import org.jboss.portal.server.util.HTTPStreamInfo;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.WindowState;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.22 $
+ * @version $Revision: 1.23 $
*/
public abstract class CoreInvocationContext extends AbstractInvocationContext implements InvocationContext
{
1.10 +3 -3 jboss-portal/core/src/main/org/jboss/portal/core/command/portlet/CoreRenderContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CoreRenderContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/command/portlet/CoreRenderContext.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -b -r1.9 -r1.10
--- CoreRenderContext.java 7 May 2006 13:57:07 -0000 1.9
+++ CoreRenderContext.java 9 Jul 2006 12:04:14 -0000 1.10
@@ -26,15 +26,15 @@
import org.jboss.portal.core.model.portal.Window;
import org.jboss.portal.portlet.spi.RenderContext;
import org.jboss.portal.portlet.StateString;
+import org.jboss.portal.portlet.Mode;
import org.jboss.portal.portlet.invocation.PortletInvocation;
import org.jboss.portal.portlet.invocation.RenderInvocation;
import org.jboss.portal.server.ServerInvocation;
-import org.jboss.portal.Mode;
-import org.jboss.portal.WindowState;
+import org.jboss.portal.portlet.WindowState;
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.9 $
+ * @version $Revision: 1.10 $
*/
public class CoreRenderContext extends CoreInvocationContext implements RenderContext
{
|
|
From: <for...@jb...> - 2006-07-09 05:00:31
|
Commit from wprice (2006-07-08 10:14 EDT) ------------------ Code comments and cleanup. jbosscx src/main/org/jboss/resource/adapter/jdbc/ExceptionSorter.java 1.6 Commit from wprice (2006-07-08 10:17 EDT) ------------------ Code comments and cleanup. jbosscx src/main/org/jboss/resource/adapter/jdbc/BaseWrapperManagedConnection.java 1.22 Commit from bwang (2006-07-08 13:31 EDT) ----------------- Changed annotation to pojo from aop. JBossCache tests-50/functional/org/jboss/cache/pojo/test/propagation/Node.java 1.3 JBossCache tests-50/functional/org/jboss/cache/pojo/test/propagation/PropagationManager.java 1.3 JBossCache tests-50/functional/org/jboss/cache/pojo/test/propagation/StateItem.java 1.3 JBossCache tests-50/functional/org/jboss/cache/pojo/test/Address.java 1.3 Commit from bwang (2006-07-08 13:39 EDT) ----------------- First cut for POJO event notification. + JBossCache tests-50/functional/org/jboss/cache/pojo/event/LocalTest.java 1.1 JBossCache src-50/org/jboss/cache/pojo/impl/PojoCacheImpl.java 1.6 + JBossCache src-50/org/jboss/cache/pojo/observable/Observer.java 1.1 + JBossCache src-50/org/jboss/cache/pojo/observable/Subject.java 1.1 + JBossCache src-50/org/jboss/cache/pojo/observable/SubjectImpl.java 1.1 + JBossCache src-50/org/jboss/cache/pojo/observable/SubjectInterceptor.java 1.1 JBossCache src-50/org/jboss/cache/pojo/MethodDeclarations.java 1.2 JBossCache src-50/org/jboss/cache/pojo/PojoTreeCache.java 1.6 JBossCache src-50/org/jboss/cache/pojo/PojoUtil.java 1.4 JBossCache src-50/org/jboss/cache/pojo/TreeCacheAopDelegate.java 1.9 JBossCache src/resources/jboss-aop.xml 1.9 Commit from unibrew (2006-07-08 19:07 EDT) ------------------- [JBFORUMS-31] Updating Forums build to work with new Portal's build scripts. jboss-portal forums/build.xml 1.23 Commit from julien (2006-07-08 20:35 EDT) ------------------ simplification : make the URLFactory return a ServerURL instead of a string URL jboss-portal core/src/main/org/jboss/portal/core/CoreController.java 1.54 jboss-portal core/src/main/org/jboss/portal/core/cms/CMSObjectURLFactory.java 1.8 jboss-portal core/src/main/org/jboss/portal/core/command/ExecutionContext.java 1.12 jboss-portal core/src/main/org/jboss/portal/core/command/mapper/DelegatingURLFactoryService.java 1.6 jboss-portal core/src/main/org/jboss/portal/core/command/mapper/URLFactory.java 1.5 jboss-portal core/src/main/org/jboss/portal/core/model/portal/PortalObjectURLFactory.java 1.19 Commit from julien (2006-07-08 20:42 EDT) ------------------ javadoc correction jboss-portal core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java 1.30 Commit from gurkanerdogdu (2006-07-09 00:37 EDT) ------------------------- New Cache Loader Custom Configuration added jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/ICacheConstants.java 1.7 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/JBossCachePlugin.java 1.4 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheConfigurationWizard.java 1.6 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/StandardConfigurationPage.java 1.6 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/CacheLoaderTableProvider.java 1.2 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/CacheLoaderConfigurationPage.java 1.5 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/config/CacheConfigurationModel.java 1.4 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs/CacheLoaderDefDialog.java 1.3 jbosside cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/utils/CacheUtil.java 1.7 |
|
From: Gurkan E. <gur...@ya...> - 2006-07-09 04:37:55
|
User: gurkanerdogdu
Date: 06/07/09 00:37:50
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs
CacheLoaderDefDialog.java
Log:
New Cache Loader Custom Configuration added
Revision Changes Path
1.3 +95 -71 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs/CacheLoaderDefDialog.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderDefDialog.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/dialogs/CacheLoaderDefDialog.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -b -r1.2 -r1.3
--- CacheLoaderDefDialog.java 6 Jul 2006 19:48:56 -0000 1.2
+++ CacheLoaderDefDialog.java 9 Jul 2006 04:37:50 -0000 1.3
@@ -1,13 +1,17 @@
package org.jboss.ide.eclipse.jbosscache.dialogs;
+import java.util.ArrayList;
+import java.util.List;
+
import org.eclipse.jface.dialogs.Dialog;
+import org.eclipse.jface.dialogs.IDialogConstants;
import org.eclipse.jface.viewers.CellEditor;
import org.eclipse.jface.viewers.ICellModifier;
import org.eclipse.jface.viewers.TableViewer;
import org.eclipse.jface.viewers.TextCellEditor;
import org.eclipse.swt.SWT;
-import org.eclipse.swt.events.SelectionAdapter;
-import org.eclipse.swt.events.SelectionEvent;
+import org.eclipse.swt.events.MouseAdapter;
+import org.eclipse.swt.events.MouseEvent;
import org.eclipse.swt.layout.GridData;
import org.eclipse.swt.layout.GridLayout;
import org.eclipse.swt.widgets.Button;
@@ -23,25 +27,35 @@
import org.jboss.ide.eclipse.jbosscache.model.CacheLoaderPropModel;
import org.jboss.ide.eclipse.jbosscache.wizards.pages.CacheLoaderLableProvider;
import org.jboss.ide.eclipse.jbosscache.wizards.pages.CacheLoaderTableProvider;
+import org.jboss.ide.eclipse.jbosscache.wizards.pages.StandardConfigurationPage;
public class CacheLoaderDefDialog extends Dialog {
private TableViewer tableViewer;
- private Button chkUseDataSource;
+ //private Button chkUseDataSource;
private Label lblUseDataSource;
private Text txtDataSource;
- private Button chkTableCreate;
- private Button chkTableDelete;
+ //private Button chkTableCreate;
+ //private Button chkTableDelete;
+ private Button addButton;
private String[] COLUMN_NAMES = new String[]{CacheMessages.Column_Properties,CacheMessages.Column_Value};
- private String cacheLoaderType;
+ //private String cacheLoaderType;
+ private List model = new ArrayList();
+ private StandardConfigurationPage page;
- public CacheLoaderDefDialog(Shell parentShell,String cacheLoaderString) {
+ public CacheLoaderDefDialog(Shell parentShell,String cacheLoaderString,StandardConfigurationPage page) {
super(parentShell);
setShellStyle(SWT.SHELL_TRIM);
- this.cacheLoaderType = cacheLoaderString;
+
+ this.page = page;
+ if(page.getCacheLoaderCustomModel() != null){
+ this.model = page.getCacheLoaderCustomModel();
+ }
+
+ //this.cacheLoaderType = cacheLoaderString;
}
protected void configureShell(Shell newShell) {
@@ -66,7 +80,15 @@
return outer;
}
- private boolean useDs = false;
+
+
+
+ @Override
+ protected void createButtonsForButtonBar(Composite parent) {
+ createButton(parent, IDialogConstants.OK_ID, IDialogConstants.OK_LABEL,true);
+ }
+
+ //private boolean useDs = false;
/**
* Create tree table
*
@@ -78,54 +100,21 @@
GridData data = new GridData(GridData.FILL_HORIZONTAL);
- GridData dChekc = new GridData(GridData.FILL_HORIZONTAL);
- dChekc.horizontalSpan = 2;
-
- chkUseDataSource = new Button(outer,SWT.CHECK);
- chkUseDataSource.setText("Use DataSource");
- chkUseDataSource.setLayoutData(dChekc);
-
- chkUseDataSource.addSelectionListener(new SelectionAdapter(){
- public void widgetSelected(SelectionEvent e){
-
- String [] params = new String[2];
- params[0] = cacheLoaderType;
-
-
- chkUseDataSource = (Button)e.widget;
- if(chkUseDataSource.getSelection()){
- lblUseDataSource.setEnabled(true);
- txtDataSource.setEnabled(true);
- txtDataSource.setEnabled(true);
- useDs = true;
- }else{
- lblUseDataSource.setEnabled(false);
- txtDataSource.setEnabled(false);
- txtDataSource.setEnabled(false);
- useDs = false;
-
- }
- params[1] = Boolean.toString(useDs);
- tableViewer.setInput(params);
- }
- });
-
lblUseDataSource = new Label(outer,SWT.NONE);
- lblUseDataSource.setText("Data Source Name: ");
- lblUseDataSource.setEnabled(false);
+ lblUseDataSource.setText("Custom Qualified Class Name: ");
txtDataSource = new Text(outer,SWT.BORDER);
txtDataSource.setLayoutData(data);
- txtDataSource.setEnabled(false);
+ txtDataSource.setText(page.getCacheLoaderCustomClassName());
- chkTableCreate = new Button(outer,SWT.CHECK);
- chkTableCreate.setText("Create DB Table");
- chkTableCreate.setLayoutData(dChekc);
-
- chkTableDelete = new Button(outer,SWT.CHECK);
- chkTableDelete.setText("Delete DB Table");
- chkTableDelete.setLayoutData(dChekc);
+ addButton = new Button(outer,SWT.PUSH);
+ addButton.setText("Add Property");
+ addButton.addMouseListener(new MouseAdapter(){
+ public void mouseDown(MouseEvent e) {
+ handleMouseClick(e);
+ }
+ });
tableViewer = new TableViewer(outer,SWT.FULL_SELECTION | SWT.BORDER);
tableViewer.setContentProvider(new CacheLoaderTableProvider());
@@ -157,53 +146,88 @@
valCol.setWidth(150);
-
TextCellEditor editor = new TextCellEditor(table);
+ TextCellEditor editorProperty = new TextCellEditor(table);
+
+
- tableViewer.setCellEditors(new CellEditor[]{null,editor});
+ tableViewer.setCellEditors(new CellEditor[]{editorProperty,editor});
ICellModifier modif = new ICellModifier(){
public boolean canModify(Object element, String property) {
- if(property.equals("property"))
- return false;
return true;
}
public Object getValue(Object element, String property) {
- if(property.equals("value")){
CacheLoaderPropModel model = (CacheLoaderPropModel)element;
+ if(property.equals("value")){
return model.getValue();
}
+
+ if(property.equals("property")){
+ return model.getProperty();
+ }
+
return null;
}
public void modify(Object element, String property, Object value) {
- if(property.equals("value")){
-
CacheLoaderPropModel model = null;
if(element instanceof Item){
model = (CacheLoaderPropModel)((Item)element).getData();
}else
model = (CacheLoaderPropModel)element;
+ if(property.equals("value")){
+
model.setValue(value.toString());
+ }else
+ model.setProperty(value.toString());
- tableViewer.refresh(model);
- }
+ tableViewer.refresh();
}
};
- String [] params = new String[2];
- params[0] = cacheLoaderType;
- params[1] = Boolean.toString(useDs);
+// String [] params = new String[2];
+// params[0] = cacheLoaderType;
+// params[1] = Boolean.toString(useDs);
tableViewer.setCellModifier(modif);
- tableViewer.setInput(params);
+ tableViewer.setInput(model);
+
+ }
+
+ private void handleMouseClick(MouseEvent e) {
+
+ List list = (List)tableViewer.getInput();
+ CacheLoaderPropModel model = new CacheLoaderPropModel();
+ model.setProperty("property");
+ model.setValue("value");
+ list.add(model);
+
+ tableViewer.refresh();
+
+ }
+
+ public List getLoaderDialogModel(){
+ return model;
+ }
+
+ public Text getTxtDataSource() {
+ return txtDataSource;
+ }
+
+ @Override
+ protected void okPressed() {
+ // TODO Auto-generated method stub
+ if(txtDataSource.getText() != null && !txtDataSource.getText().trim().equals(""))
+ page.setCacheLoaderCustomClassName(txtDataSource.getText().trim());
+ super.okPressed();
}
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-09 04:37:55
|
User: gurkanerdogdu
Date: 06/07/09 00:37:50
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache
ICacheConstants.java JBossCachePlugin.java
Log:
New Cache Loader Custom Configuration added
Revision Changes Path
1.7 +2 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/ICacheConstants.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ICacheConstants.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/ICacheConstants.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- ICacheConstants.java 8 Jul 2006 01:59:06 -0000 1.6
+++ ICacheConstants.java 9 Jul 2006 04:37:50 -0000 1.7
@@ -136,6 +136,7 @@
/**Cache Loader Class */
String CACHE_LOADER_CLASSES[] = new String[]{"None",
+ "Custom Configuration...",
"org.jboss.cache.loader.JDBCCacheLoader",
"org.jboss.cache.loader.JDBCExtendedCacheLoader",
"org.jboss.cache.loader.FileCacheLoader",
@@ -189,7 +190,7 @@
{"NONE", "READ_UNCOMMITTED", "READ_COMMITTED", "REPEATABLE_READ", "SERIALIZABLE"};
/**DEFAULT EVICTION POLICY CLASSES*/
- String EVICTION_POLICY_CLASSES [] = new String[]{"None","org.jboss.cache.TreeCache.LRUPolicy",
+ String EVICTION_POLICY_CLASSES [] = new String[]{"None","Custom Configuration...","org.jboss.cache.TreeCache.LRUPolicy",
"org.jboss.cache.TreeCache.FIFOPolicy",
"org.jboss.cache.TreeCache.MRUPolicy",
"org.jboss.cache.TreeCache.LFUPolicy"};
1.4 +10 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/JBossCachePlugin.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: JBossCachePlugin.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/JBossCachePlugin.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- JBossCachePlugin.java 8 Jul 2006 01:59:06 -0000 1.3
+++ JBossCachePlugin.java 9 Jul 2006 04:37:50 -0000 1.4
@@ -70,6 +70,7 @@
private static final String CACHE_REMOTE_URL = "url";
private static final String CACHE_REMOTE_PORT = "port";
private static final String CACHE_REMOTE_JNDI = "jndi";
+ private static final String CACHE_REMOTE_SERVICE_NAME = "service-name";
private static int numberOfInstance;
@@ -390,6 +391,7 @@
CacheInstanceFactory.getCacheRootMainInstance().addRootInstanceChild(rootInstance);
RemoteCacheConfigParams params = new RemoteCacheConfigParams();
+
IMemento remMemonto = child.getChild(CACHE_REMOTE_URL);
params.setUrl(remMemonto.getString(NAME));
remMemonto = child.getChild(CACHE_REMOTE_PORT);
@@ -397,6 +399,9 @@
remMemonto = child.getChild(CACHE_REMOTE_JNDI);
params.setJndi(remMemonto.getString(NAME));
+ remMemonto = child.getChild(CACHE_REMOTE_SERVICE_NAME);
+ String cacheServiceName = remMemonto.getString(NAME);
+
IMemento[] childJarFileLocation = child.getChildren(CACHE_SERVICE_JAR_FILE);
List jarPath = new ArrayList();
@@ -409,6 +414,7 @@
params.setJarList(jarPath);
rootInstance.setRemoteCacheConfigParams(params);
+ rootInstance.setCacheServiceName(cacheServiceName);
}
}
}
@@ -479,6 +485,9 @@
nodeChildMemonto = childMemento.createChild(CACHE_REMOTE_JNDI);
nodeChildMemonto.putString(NAME,params.getJndi());
+ nodeChildMemonto = childMemento.createChild(CACHE_REMOTE_SERVICE_NAME);
+ nodeChildMemonto.putString(NAME,rootInstance.getCacheServiceName());
+
List jarFiles = rootInstance.getRemoteCacheConfigParams().getJarList();
if (jarFiles != null)
{
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-09 04:37:54
|
User: gurkanerdogdu
Date: 06/07/09 00:37:50
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards
NewCacheConfigurationWizard.java
Log:
New Cache Loader Custom Configuration added
Revision Changes Path
1.6 +5 -0 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheConfigurationWizard.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: NewCacheConfigurationWizard.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheConfigurationWizard.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- NewCacheConfigurationWizard.java 6 Jul 2006 19:48:56 -0000 1.5
+++ NewCacheConfigurationWizard.java 9 Jul 2006 04:37:50 -0000 1.6
@@ -262,6 +262,11 @@
.getTxtSyncReplTimeout().getText().trim());
cacheConfigModel.setUseReplQueue(stdConfPage
.getChkUseReplicationQueue().getSelection());
+
+ if(stdConfPage.getCmbCacheLoaderClass().getSelectionIndex() == 1){
+ cacheConfigModel.setCacheLoaderCustomParams(stdConfPage.getCacheLoaderDialog().getLoaderDialogModel());
+ cacheConfigModel.setCacheLoaderCustomName(stdConfPage.getCacheLoaderCustomClassName());
+ }
}
/**
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-09 04:37:54
|
User: gurkanerdogdu
Date: 06/07/09 00:37:50
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/utils
CacheUtil.java
Log:
New Cache Loader Custom Configuration added
Revision Changes Path
1.7 +31 -9 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/utils/CacheUtil.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheUtil.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/utils/CacheUtil.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -b -r1.6 -r1.7
--- CacheUtil.java 8 Jul 2006 01:59:06 -0000 1.6
+++ CacheUtil.java 9 Jul 2006 04:37:50 -0000 1.7
@@ -34,6 +34,7 @@
import org.jboss.cache.Fqn;
import org.jboss.ide.eclipse.jbosscache.ICacheConstants;
import org.jboss.ide.eclipse.jbosscache.JBossCachePlugin;
+import org.jboss.ide.eclipse.jbosscache.model.CacheLoaderPropModel;
import org.jboss.ide.eclipse.jbosscache.model.cache.ICacheInstance;
import org.jboss.ide.eclipse.jbosscache.model.cache.ICacheRootInstance;
import org.jboss.ide.eclipse.jbosscache.model.config.CacheConfigurationModel;
@@ -342,11 +343,16 @@
childConfigMemento = childConfigMemento.createChild(ICacheConstants.CACHELOADER);
childMBeanMemonto = childConfigMemento.createChild(ICacheConstants.CLASS);
+
+
+ if(cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[1])){
+ childMBeanMemonto.putTextData(cacheConfigModel.getCacheLoaderCustomName());
+ }else
childMBeanMemonto.putTextData(cacheConfigModel.getCacheLoaderClass());
childMBeanMemonto= childConfigMemento.createChild("properties");
- if (cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[1]) || cacheLoaderConfig.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[2]))
+ if (cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[2]) || cacheLoaderConfig.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[3]))
{
childMBeanMemonto.putTextData("\n\t" + "cache.jdbc.table.name=" + "jbosscache"
+ "\n" + "\t" + "cache.jdbc.table.create="
@@ -362,28 +368,44 @@
+ "username" + "\n" + "\t" + "cache.jdbc.password="
+ "password" + "\n");
+ }else if(cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[1])){
+
+ List list = cacheConfigModel.getCacheLoaderCustomParams();
+
+ StringBuffer buffer = new StringBuffer();
+
+ for(int i=0;i<list.size();i++){
+ CacheLoaderPropModel model = (CacheLoaderPropModel)list.get(i);
+
+ if(i<list.size()-1)
+ buffer.append("\n\t"+model.getProperty()+"="+model.getValue());
+ else
+ buffer.append("\n\t"+model.getProperty()+"="+model.getValue()+"\n");
+ }
+
+ childMBeanMemonto.putTextData(buffer.toString());
}
- else if (cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[3]) ||
- cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[4]) ||
- cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[5]))
+ else if (cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[4]) ||
+ cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[5]) ||
+ cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[6]))
{
childMBeanMemonto.putTextData("location=" + "location");
}
- else if(cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[6]))
+ else if(cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[7]))
{
childMBeanMemonto.putTextData("timeout=" + "timeout");
}
- else if(cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[7]))
+ else if(cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[8]))
{
childMBeanMemonto.putTextData("\n\t" + "host=" + "host"
+ "\n" + "\t" + "port=port"+"\n");
}
- else if(cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[8]))
+ else if(cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[9]))
{
childMBeanMemonto.putTextData("\n\t" + "host=" + "host"
+"\n\t" + "port=port"
+"\n\t" + "bindname=bindname"+"/n");
- }else{
+ }else if(cacheConfigModel.getCacheLoaderClass().equals(ICacheConstants.CACHE_LOADER_CLASSES[10])){
childMBeanMemonto.putTextData("timeout=" + "timeout");
}
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-09 04:37:54
|
User: gurkanerdogdu
Date: 06/07/09 00:37:50
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages
StandardConfigurationPage.java
CacheLoaderTableProvider.java
CacheLoaderConfigurationPage.java
Log:
New Cache Loader Custom Configuration added
Revision Changes Path
1.6 +59 -11 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/StandardConfigurationPage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: StandardConfigurationPage.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/StandardConfigurationPage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -b -r1.5 -r1.6
--- StandardConfigurationPage.java 6 Jul 2006 19:48:56 -0000 1.5
+++ StandardConfigurationPage.java 9 Jul 2006 04:37:50 -0000 1.6
@@ -9,6 +9,7 @@
import java.io.File;
import java.util.ArrayList;
import java.util.Iterator;
+import java.util.List;
import org.eclipse.core.runtime.Path;
import org.eclipse.jface.resource.ImageDescriptor;
@@ -34,7 +35,10 @@
import org.eclipse.swt.widgets.Label;
import org.eclipse.swt.widgets.Text;
import org.eclipse.swt.widgets.Widget;
+import org.eclipse.ui.forms.widgets.Hyperlink;
import org.jboss.ide.eclipse.jbosscache.ICacheConstants;
+import org.jboss.ide.eclipse.jbosscache.JBossCachePlugin;
+import org.jboss.ide.eclipse.jbosscache.dialogs.CacheLoaderDefDialog;
import org.jboss.ide.eclipse.jbosscache.internal.CacheMessages;
import org.jboss.ide.eclipse.jbosscache.model.config.CacheConfigParams;
import org.jboss.ide.eclipse.jbosscache.utils.CacheUtil;
@@ -66,6 +70,8 @@
private static final String DEFAULT_LOCK_ACK_TIMEOUT = "15000";
+ private CacheLoaderDefDialog cacheLoaderDialog;
+
private Label lblCacheName;
private Text txtCacheName;
@@ -153,10 +159,12 @@
private ISelection selection;
- //TODO : Eviction Policy Configuration must be added;
-
private Group grpConfGroup;
+ private List cacheLoaderCustomModel = new ArrayList();
+
+ private String cacheLoaderCustomClassName = "";
+
// private Button btnClusterConfig; /*Show new wizard for cluster configuration*/
// private Button btnCacheLoaderClass;/*Show new wizard for cache loader configuration*/
@@ -194,6 +202,7 @@
GridData gridData = new GridData(GridData.FILL_HORIZONTAL);
+
Group filePath = new Group(container, SWT.SHADOW_ETCHED_IN);
filePath.setText("File Location");
GridData gDataPath = new GridData(GridData.FILL_HORIZONTAL);
@@ -230,6 +239,7 @@
txtConfFileName = new Text(filePath, SWT.BORDER);
txtConfFileName.setText(DEFAULT_CACHE_XML_FILE_NAME);
txtConfFileName.addModifyListener(this);
+
GridData gDataForConfText = new GridData(GridData.FILL_HORIZONTAL);
gDataForConfText.horizontalSpan = 2;
txtConfFileName.setLayoutData(gDataForConfText);
@@ -360,14 +370,23 @@
cmbDefaultEvcitionPolicy = new Combo(grpConfGroup,SWT.DROP_DOWN);
cmbDefaultEvcitionPolicy.setItems(ICacheConstants.EVICTION_POLICY_CLASSES);
cmbDefaultEvcitionPolicy.select(0);
- cmbDefaultEvcitionPolicy.setLayoutData(gridData);
+ cmbDefaultEvcitionPolicy.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+
lblCacheLoaderClass = new Label(grpConfGroup, SWT.NONE);
lblCacheLoaderClass.setText("Default Cache Loader :");
- cmbCacheLoaderClass = new Combo(grpConfGroup, SWT.DROP_DOWN);
+
+ cmbCacheLoaderClass = new Combo(grpConfGroup, SWT.READ_ONLY);
cmbCacheLoaderClass.setItems(ICacheConstants.CACHE_LOADER_CLASSES);
cmbCacheLoaderClass.select(0);
- cmbCacheLoaderClass.setLayoutData(gridData);
+ cmbCacheLoaderClass.setLayoutData(new GridData(GridData.FILL_HORIZONTAL));
+ cmbCacheLoaderClass.addSelectionListener(new SelectionAdapter(){
+
+ public void widgetSelected(SelectionEvent e){
+ handleCustomCacheLoader(e);
+ }
+ });
+
chkBuddyReplicationEnabled = new Button(grpConfGroup,SWT.CHECK);
@@ -434,7 +453,16 @@
setControl(container);
}//end of method
- /**
+ private void handleCustomCacheLoader(SelectionEvent e) {
+ Combo combo = (Combo)e.widget;
+
+ if(combo.getSelectionIndex() == 1){//Custom
+ cacheLoaderDialog = new CacheLoaderDefDialog(getShell(),"Custom Cache Loader Configuration",this);
+ cacheLoaderDialog.open();
+ }
+ }
+
+/**
* Jar selection
*/
private void handleAddJarSelected()
@@ -784,4 +812,24 @@
this.chkBuddyReplicationEnabled = chkBuddyReplicationEnabled;
}
+public CacheLoaderDefDialog getCacheLoaderDialog() {
+ return cacheLoaderDialog;
+}
+
+public List getCacheLoaderCustomModel() {
+ return cacheLoaderCustomModel;
+}
+
+public void setCacheLoaderCustomModel(List cacheLoaderCustomModel) {
+ this.cacheLoaderCustomModel = cacheLoaderCustomModel;
+}
+
+public String getCacheLoaderCustomClassName() {
+ return cacheLoaderCustomClassName;
+}
+
+public void setCacheLoaderCustomClassName(String cacheLoaderCustomClassName) {
+ this.cacheLoaderCustomClassName = cacheLoaderCustomClassName;
+}
+
}//end of class
\ No newline at end of file
1.2 +2 -7 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/CacheLoaderTableProvider.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderTableProvider.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/CacheLoaderTableProvider.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -b -r1.1 -r1.2
--- CacheLoaderTableProvider.java 6 Jul 2006 17:17:01 -0000 1.1
+++ CacheLoaderTableProvider.java 9 Jul 2006 04:37:50 -0000 1.2
@@ -1,6 +1,7 @@
package org.jboss.ide.eclipse.jbosscache.wizards.pages;
import java.util.Collections;
+import java.util.List;
import org.eclipse.jface.viewers.IStructuredContentProvider;
import org.eclipse.jface.viewers.Viewer;
@@ -13,13 +14,7 @@
if(inputElement == null || inputElement.equals(""))
return Collections.EMPTY_LIST.toArray();
- String[] params = (String[])inputElement;
-
- String element = params[0];
- boolean isDs = Boolean.parseBoolean(params[1]);
-
-
- return new CacheLoaderPropModel().getPropertyModels(element,isDs).toArray();
+ return ((List)inputElement).toArray();
}
public void dispose() {
1.5 +1 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/CacheLoaderConfigurationPage.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheLoaderConfigurationPage.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/pages/CacheLoaderConfigurationPage.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -b -r1.4 -r1.5
--- CacheLoaderConfigurationPage.java 6 Jul 2006 19:48:56 -0000 1.4
+++ CacheLoaderConfigurationPage.java 9 Jul 2006 04:37:50 -0000 1.5
@@ -283,7 +283,7 @@
public void linkActivated(HyperlinkEvent e) {
//Dialog open
- CacheLoaderDefDialog dialog = new CacheLoaderDefDialog(getShell(),cmbCacheLoaderClass.getText());
+ CacheLoaderDefDialog dialog = new CacheLoaderDefDialog(getShell(),cmbCacheLoaderClass.getText(),null);
dialog.open();
}
|
|
From: Gurkan E. <gur...@ya...> - 2006-07-09 04:37:54
|
User: gurkanerdogdu
Date: 06/07/09 00:37:50
Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/config
CacheConfigurationModel.java
Log:
New Cache Loader Custom Configuration added
Revision Changes Path
1.4 +42 -0 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/config/CacheConfigurationModel.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: CacheConfigurationModel.java
===================================================================
RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/config/CacheConfigurationModel.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -b -r1.3 -r1.4
--- CacheConfigurationModel.java 6 Jul 2006 17:17:01 -0000 1.3
+++ CacheConfigurationModel.java 9 Jul 2006 04:37:50 -0000 1.4
@@ -6,6 +6,8 @@
*/
package org.jboss.ide.eclipse.jbosscache.model.config;
+import java.util.List;
+
/**
* This model holds all the configuration related information
* @author Gurkaner
@@ -62,6 +64,14 @@
private String cacheLoaderClass; /*IDE 2.0 version*/
+ private List cacheLoaderCustomParams;
+
+ private String cacheLoaderCustomName;
+
+ private List evictionPolicyCustomParams;
+
+ private String evcitionPolicyCustomName;
+
/**Model instance */
@@ -1138,4 +1148,36 @@
public void setCacheType(String cacheType) {
this.cacheType = cacheType;
}
+
+public List getCacheLoaderCustomParams() {
+ return cacheLoaderCustomParams;
+}
+
+public List getEvictionPolicyCustomParams() {
+ return evictionPolicyCustomParams;
+}
+
+public void setCacheLoaderCustomParams(List cacheLoaderCustomParams) {
+ this.cacheLoaderCustomParams = cacheLoaderCustomParams;
+}
+
+public void setEvictionPolicyCustomParams(List evictionPolicyCustomParams) {
+ this.evictionPolicyCustomParams = evictionPolicyCustomParams;
+}
+
+public String getCacheLoaderCustomName() {
+ return cacheLoaderCustomName;
+}
+
+public void setCacheLoaderCustomName(String cacheLoaderCustomName) {
+ this.cacheLoaderCustomName = cacheLoaderCustomName;
+}
+
+public String getEvcitionPolicyCustomName() {
+ return evcitionPolicyCustomName;
+}
+
+public void setEvcitionPolicyCustomName(String evcitionPolicyCustomName) {
+ this.evcitionPolicyCustomName = evcitionPolicyCustomName;
+}
}
\ No newline at end of file
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 00:42:18
|
User: julien
Date: 06/07/08 20:42:17
Modified: core/src/main/org/jboss/portal/core/aspects/server
UserInterceptor.java
Log:
javadoc correction
Revision Changes Path
1.30 +2 -2 jboss-portal/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: UserInterceptor.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/aspects/server/UserInterceptor.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -b -r1.29 -r1.30
--- UserInterceptor.java 7 Jul 2006 21:48:09 -0000 1.29
+++ UserInterceptor.java 9 Jul 2006 00:42:17 -0000 1.30
@@ -44,13 +44,13 @@
/**
* The interceptor is responsible for managing the user identity lifecycle based
- * on the string returned the <code>HttpServletRequest.getRemoteUser</code> method.
+ * on the principal name returned by the <code>HttpServletRequest.getUserPrincipal()</code> method.
*
* It manages also the user finalization that will set the last login date to the
* current value when the user is not used anymore.
*
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.29 $
+ * @version $Revision: 1.30 $
*/
public class UserInterceptor extends ServerInterceptor
{
|
|
From: Julien V. <ju...@jb...> - 2006-07-09 00:35:46
|
User: julien
Date: 06/07/08 20:35:44
Modified: core/src/main/org/jboss/portal/core/command
ExecutionContext.java
Log:
simplification : make the URLFactory return a ServerURL instead of a string URL
Revision Changes Path
1.12 +4 -2 jboss-portal/core/src/main/org/jboss/portal/core/command/ExecutionContext.java
(In the diff below, changes in quantity of whitespace are not shown.)
Index: ExecutionContext.java
===================================================================
RCS file: /cvsroot/jboss/jboss-portal/core/src/main/org/jboss/portal/core/command/ExecutionContext.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -b -r1.11 -r1.12
--- ExecutionContext.java 4 Jul 2006 10:07:50 -0000 1.11
+++ ExecutionContext.java 9 Jul 2006 00:35:44 -0000 1.12
@@ -23,6 +23,7 @@
import org.jboss.portal.core.CoreController;
import org.jboss.portal.server.ServerInvocation;
+import org.jboss.portal.server.ServerURL;
import org.jboss.portal.server.request.URLContext;
import org.jboss.portal.server.request.URLFormat;
@@ -30,7 +31,7 @@
/**
* @author <a href="mailto:ju...@jb...">Julien Viet</a>
- * @version $Revision: 1.11 $
+ * @version $Revision: 1.12 $
*/
public class ExecutionContext
{
@@ -68,7 +69,8 @@
public String encodeURL(ControllerCommand cmd, URLContext urlContext, URLFormat format)
{
- return controller.getURLFactory().doMapping(serverInvocation, cmd, urlContext, format);
+ ServerURL serverURL = controller.getURLFactory().doMapping(serverInvocation, cmd);
+ return serverInvocation.getResponse().encodeURL(serverURL, urlContext, format);
}
public void execute(ControllerCommand nextCommand) throws CommandException
|
185 messages has been excluded from this view by a project administrator.
