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: Weston P. <wes...@jb...> - 2006-07-07 02:47:29
|
User: wprice Date: 06/07/06 22:47:26 Added: src/main/org/jboss/test/jcaprops/test JBossRaXmlOverrideUnitTestCase.java Log: [JBAS-3343] New additions allow for overriding ra.xml ResourceAdapter level properties with jboss-ra.xml file. New meta data constructs, ObjectModelFactory and extension to the RARDeployer encompass this new functionality. Added new unit test case and support files. Revision Changes Path 1.1 date: 2006/07/07 02:47:26; author: wprice; state: Exp;jbosstest/src/main/org/jboss/test/jcaprops/test/JBossRaXmlOverrideUnitTestCase.java Index: JBossRaXmlOverrideUnitTestCase.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.test.jcaprops.test; import javax.management.Attribute; import javax.management.AttributeList; import javax.management.MBeanServerConnection; import junit.framework.Test; import org.jboss.test.JBossTestCase; import org.jboss.test.jcaprops.support.PropertyTestResourceAdapterMBean; /** * A JBossRaXmlOverrideTestCase. * * @author <a href="wes...@jb...">Weston Price</a> * @version $Revision: 1.1 $ */ public class JBossRaXmlOverrideUnitTestCase extends JBossTestCase { public JBossRaXmlOverrideUnitTestCase(String name) { super(name); } public void testJBossRaXmlOverride() throws Exception { AttributeList expected = new AttributeList(); expected.add(new Attribute("StringRAR", "XMLOVERRIDE")); expected.add(new Attribute("BooleanRAR", Boolean.FALSE)); expected.add(new Attribute("ByteRAR", new Byte((byte) 1))); expected.add(new Attribute("CharacterRAR", new Character('A'))); expected.add(new Attribute("ShortRAR", new Short((short) 2))); expected.add(new Attribute("IntegerRAR", new Integer(3))); expected.add(new Attribute("LongRAR", new Long(4))); expected.add(new Attribute("FloatRAR", Float.valueOf("5e6"))); expected.add(new Attribute("DoubleRAR", Double.valueOf("7e8"))); MBeanServerConnection connection = getServer(); AttributeList result = connection.getAttributes(PropertyTestResourceAdapterMBean.NAME, getExpectedStringArray(expected)); AttributeList resultClone = (AttributeList) result.clone(); resultClone.removeAll(expected); assertTrue("Did not expect: " + list(resultClone) + " expected " + list(expected), resultClone.size() == 0); expected.removeAll(result); assertTrue("Expected: " + list(expected) + " got " + list(result), expected.size() == 0); } public static Test suite() throws Exception { return getDeploySetup(JBossRaXmlOverrideUnitTestCase.class, "testjcaprops-override.rar"); } protected String[] getExpectedStringArray(AttributeList attributes) { String[] result = new String[attributes.size()]; for (int i = 0; i < attributes.size(); ++i) result [i] = ((Attribute) attributes.get(i)).getName(); return result; } protected String list(AttributeList list) { StringBuffer buffer = new StringBuffer(); buffer.append('['); for (int i = 0; i < list.size(); ++i) { Attribute attribute = (Attribute) list.get(i); buffer.append(attribute.getName()); buffer.append('='); buffer.append(attribute.getValue()); if (i+1 < list.size()) buffer.append(", "); } buffer.append(']'); return buffer.toString(); } } |
From: Weston P. <wes...@jb...> - 2006-07-07 02:43:43
|
User: wprice Date: 06/07/06 22:43:42 Modified: src/main/org/jboss/resource/metadata ConnectorMetaData.java Added: src/main/org/jboss/resource/metadata JBossRAMetaData.java RARDeploymentMetaData.java Log: [JBAS-3343] New additions allow for overriding ra.xml ResourceAdapter level properties with jboss-ra.xml file. New meta data constructs, ObjectModelFactory and extension to the RARDeployer encompass this new functionality. Revision Changes Path 1.10 +7 -1 jbosscx/src/main/org/jboss/resource/metadata/ConnectorMetaData.java (In the diff below, changes in quantity of whitespace are not shown.) Index: ConnectorMetaData.java =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/metadata/ConnectorMetaData.java,v retrieving revision 1.9 retrieving revision 1.10 diff -u -b -r1.9 -r1.10 --- ConnectorMetaData.java 21 Nov 2005 21:53:18 -0000 1.9 +++ ConnectorMetaData.java 7 Jul 2006 02:43:42 -0000 1.10 @@ -21,6 +21,7 @@ */ package org.jboss.resource.metadata; +import java.util.Collection; import java.util.HashSet; import java.util.Iterator; import java.util.Locale; @@ -31,7 +32,7 @@ * Connector meta data * * @author <a href="mailto:ad...@jb...">Adrian Brock</a> - * @version $Revision: 1.9 $ + * @version $Revision: 1.10 $ */ public class ConnectorMetaData extends ConfigPropertyMetaDataContainer { @@ -376,6 +377,11 @@ return null; } + public Collection getAdminObjects() + { + return adminObjects; + } + /** * Add a security permission * 1.1 date: 2006/07/07 02:43:42; author: wprice; state: Exp;jbosscx/src/main/org/jboss/resource/metadata/JBossRAMetaData.java Index: JBossRAMetaData.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.resource.metadata; /** * A JBossRAMetaData. * * @author <a href="wes...@jb...">Weston Price</a> * @version $Revision: 1.1 $ */ public class JBossRAMetaData extends ConfigPropertyMetaDataContainer { /** The serialVersionUID */ private static final long serialVersionUID = -8041048198795930659L; } 1.1 date: 2006/07/07 02:43:42; author: wprice; state: Exp;jbosscx/src/main/org/jboss/resource/metadata/RARDeploymentMetaData.java Index: RARDeploymentMetaData.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.resource.metadata; /** * A RARDeploymentMetaData. * * @author <a href="wes...@jb...">Weston Price</a> * @version $Revision: 1.1 $ */ public class RARDeploymentMetaData { private ConnectorMetaData connectorMetaData = new ConnectorMetaData(); private JBossRAMetaData raXmlMetaData = new JBossRAMetaData(); public ConnectorMetaData getConnectorMetaData() { return connectorMetaData; } public void setConnectorMetaData(ConnectorMetaData connectorMetaData) { this.connectorMetaData = connectorMetaData; } public JBossRAMetaData getRaXmlMetaData() { return raXmlMetaData; } public void setRaXmlMetaData(JBossRAMetaData raXmlMetaData) { this.raXmlMetaData = raXmlMetaData; } } |
From: Weston P. <wes...@jb...> - 2006-07-07 02:43:24
|
User: wprice Date: 06/07/06 22:43:23 Modified: src/main/org/jboss/resource/deployment RARDeployment.java ResourceAdapterFactory.java RARDeployer.java Added: src/main/org/jboss/resource/deployment JBossRAObjectModelFactory.java Log: [JBAS-3343] New additions allow for overriding ra.xml ResourceAdapter level properties with jboss-ra.xml file. New meta data constructs, ObjectModelFactory and extension to the RARDeployer encompass this new functionality. Revision Changes Path 1.15 +15 -4 jbosscx/src/main/org/jboss/resource/deployment/RARDeployment.java (In the diff below, changes in quantity of whitespace are not shown.) Index: RARDeployment.java =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/deployment/RARDeployment.java,v retrieving revision 1.14 retrieving revision 1.15 diff -u -b -r1.14 -r1.15 --- RARDeployment.java 21 Nov 2005 21:43:40 -0000 1.14 +++ RARDeployment.java 7 Jul 2006 02:43:23 -0000 1.15 @@ -44,7 +44,9 @@ import org.jboss.resource.metadata.ConfigPropertyMetaData; import org.jboss.resource.metadata.ConnectorMetaData; import org.jboss.resource.metadata.DescriptionGroupMetaData; +import org.jboss.resource.metadata.JBossRAMetaData; import org.jboss.resource.metadata.MessageListenerMetaData; +import org.jboss.resource.metadata.RARDeploymentMetaData; import org.jboss.system.ServiceDynamicMBeanSupport; import org.jboss.system.server.ServerConfigUtil; @@ -52,7 +54,7 @@ * A resource adapter deployment * * @author <a href="ad...@jb...">Adrian Brock</a> - * @version $Revision: 1.14 $ + * @version $Revision: 1.15 $ */ public class RARDeployment extends ServiceDynamicMBeanSupport implements BootstrapContext @@ -63,9 +65,15 @@ /** Our deployer */ protected RARDeployer deployer; - /** The meta data */ + /** The RARDeploymentMetaData */ + protected RARDeploymentMetaData rdmd; + + /** The ConnectorMetaData */ protected ConnectorMetaData cmd; + /** The JBossRAMetaData */ + protected JBossRAMetaData ramd; + /** The resource adapter */ protected ResourceAdapter resourceAdapter; @@ -78,7 +86,10 @@ { this.di = di; this.deployer = (RARDeployer) di.deployer; - this.cmd = (ConnectorMetaData) di.metaData; + this.rdmd = (RARDeploymentMetaData)di.metaData; + this.cmd = rdmd.getConnectorMetaData(); + this.ramd = rdmd.getRaXmlMetaData(); + } // Public -------------------------------------------------------- @@ -105,7 +116,7 @@ log.info ("Required license terms exist, view META-INF/ra.xml in " + ServerConfigUtil.shortUrlFromServerHome(di.url.toString())); log.debug("License terms full URL: " + di.url); } - resourceAdapter = ResourceAdapterFactory.createResourceAdapter(cmd); + resourceAdapter = ResourceAdapterFactory.createResourceAdapter(rdmd); resourceAdapter.start(this); } 1.8 +60 -27 jbosscx/src/main/org/jboss/resource/deployment/ResourceAdapterFactory.java (In the diff below, changes in quantity of whitespace are not shown.) Index: ResourceAdapterFactory.java =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/deployment/ResourceAdapterFactory.java,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- ResourceAdapterFactory.java 21 Nov 2005 21:43:40 -0000 1.7 +++ ResourceAdapterFactory.java 7 Jul 2006 02:43:23 -0000 1.8 @@ -32,12 +32,14 @@ import org.jboss.deployment.DeploymentException; import org.jboss.resource.metadata.ConfigPropertyMetaData; import org.jboss.resource.metadata.ConnectorMetaData; +import org.jboss.resource.metadata.RARDeploymentMetaData; /** * A resource adapter factory * * @author <a href="ad...@jb...">Adrian Brock</a> - * @version $Revision: 1.7 $ + * @author <a href="wes...@jb...">Weston Price</a> + * @version $Revision: 1.8 $ */ public class ResourceAdapterFactory { @@ -45,6 +47,27 @@ public static final String DUMMY_RA_CLASS = DummyResourceAdapter.class.getName(); /** + * Create a new ResourceAdapter + * + * @param ramd the ResourceAdapterMetaData + * @return the resource adapter + * @throws Exception + */ + public static ResourceAdapter createResourceAdapter(RARDeploymentMetaData ramd) throws Exception + { + ResourceAdapter adapter = createResourceAdapter(ramd.getConnectorMetaData()); + + for(Iterator iter = ramd.getRaXmlMetaData().getProperties().iterator(); iter.hasNext();) + { + ConfigPropertyMetaData cpmd = (ConfigPropertyMetaData)iter.next(); + applyProperty(cpmd, adapter.getClass(), adapter); + + } + + return adapter; + } + + /** * Create a new resource adapter * * @param cmd the connector meta data @@ -72,6 +95,17 @@ for (Iterator i = cmd.getProperties().iterator(); i.hasNext();) { ConfigPropertyMetaData cpmd = (ConfigPropertyMetaData) i.next(); + applyProperty(cpmd, raClass, result); + + + } + + return result; + } + + private static void applyProperty(ConfigPropertyMetaData cpmd, Class clz, ResourceAdapter ra) throws Exception + { + String name = cpmd.getName(); String type = cpmd.getType(); String value = cpmd.getValue(); @@ -88,19 +122,18 @@ String setter = "set" + Character.toUpperCase(name.charAt(0)); if (name.length() > 1) setter = setter.concat(name.substring(1)); - Method method = raClass.getMethod(setter, new Class[] { clazz }); - method.invoke(result, new Object[] { object }); + Method method = clz.getMethod(setter, new Class[] { clazz }); + method.invoke(ra, new Object[] { object }); } catch (InvocationTargetException e) { - DeploymentException.rethrowAsDeploymentException("Error for resource adapter class " + raClass.getName() + " setting property " + cpmd, e.getTargetException()); + DeploymentException.rethrowAsDeploymentException("Error for resource adapter class " + clz.getName() + " setting property " + cpmd, e.getTargetException()); } catch (Throwable t) { - DeploymentException.rethrowAsDeploymentException("Error for resource adapter class " + raClass.getName() + " accessing property setter " + cpmd, t); - } + DeploymentException.rethrowAsDeploymentException("Error for resource adapter class " + clz.getName() + " accessing property setter " + cpmd, t); } - return result; } + } 1.19 +67 -1 jbosscx/src/main/org/jboss/resource/deployment/RARDeployer.java (In the diff below, changes in quantity of whitespace are not shown.) Index: RARDeployer.java =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/deployment/RARDeployer.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -b -r1.18 -r1.19 --- RARDeployer.java 21 Nov 2005 21:43:40 -0000 1.18 +++ RARDeployer.java 7 Jul 2006 02:43:23 -0000 1.19 @@ -21,6 +21,10 @@ */ package org.jboss.resource.deployment; +import java.io.IOException; +import java.io.InputStream; +import java.net.URL; + import javax.management.ObjectName; import javax.resource.spi.XATerminator; import javax.resource.spi.work.WorkManager; @@ -28,17 +32,25 @@ import org.jboss.deployment.DeploymentException; import org.jboss.deployment.DeploymentInfo; import org.jboss.deployment.ObjectModelFactorySimpleSubDeployerSupport; +import org.jboss.resource.metadata.ConnectorMetaData; +import org.jboss.resource.metadata.JBossRAMetaData; +import org.jboss.resource.metadata.RARDeploymentMetaData; import org.jboss.xb.binding.ObjectModelFactory; +import org.jboss.xb.binding.Unmarshaller; +import org.jboss.xb.binding.UnmarshallerFactory; /** * A resource adapter deployer * * @author <a href="ad...@jb...">Adrian Brock</a> - * @version $Revision: 1.18 $ + * @author <a href="wes...@jb...">Weston Price</a> + * @version $Revision: 1.19 $ */ public class RARDeployer extends ObjectModelFactorySimpleSubDeployerSupport implements RARDeployerMBean { + private static final String JBOSS_RA_XML = "META-INF/jboss-ra.xml"; + /** The work manager name */ protected ObjectName workManagerName; @@ -56,6 +68,55 @@ setEnhancedSuffixes(new String[] { "250:.rar" }); } + protected void parseMetaData(DeploymentInfo di, URL url) throws DeploymentException + { + + super.parseMetaData(di, url); + + InputStream is = di.localCl.getResourceAsStream(JBOSS_RA_XML); + RARDeploymentMetaData rdmd = new RARDeploymentMetaData(); + rdmd.setConnectorMetaData((ConnectorMetaData)di.metaData); + di.metaData = rdmd; + + try + { + if(is != null) + { + + Unmarshaller unmarshaller = UnmarshallerFactory.newInstance().newUnmarshaller(); + ObjectModelFactory factory = getExtendedObjectModelFactory(); + JBossRAMetaData ramd = (JBossRAMetaData)unmarshaller.unmarshal(is, factory, (Object)null); + rdmd.setRaXmlMetaData(ramd); + + } + + } + + catch (Throwable t) + { + + DeploymentException.rethrowAsDeploymentException("Error parsing meta data " + url, t); + + }finally + { + try + { + if(is != null) + { + is.close(); + } + } + catch (IOException e) + { + // TODO Auto-generated catch block + e.printStackTrace(); + } + } + + + //Do jboss-ra.xml + + } public String getExtension() { return ".rar"; @@ -114,4 +175,9 @@ xaTerminator = (XATerminator) server.getAttribute(xaTerminatorName, "XATerminator"); super.startService(); } + + private ObjectModelFactory getExtendedObjectModelFactory() + { + return new JBossRAObjectModelFactory(); + } } 1.1 date: 2006/07/07 02:43:23; author: wprice; state: Exp;jbosscx/src/main/org/jboss/resource/deployment/JBossRAObjectModelFactory.java Index: JBossRAObjectModelFactory.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.resource.deployment; import org.jboss.logging.Logger; import org.jboss.resource.metadata.ConfigPropertyMetaData; import org.jboss.resource.metadata.JBossRAMetaData; import org.jboss.xb.binding.ObjectModelFactory; import org.jboss.xb.binding.UnmarshallingContext; import org.xml.sax.Attributes; /** * A JBossRAObjectModelFactory. * * @author <a href="wes...@jb...">Weston Price</a> * @version $Revision: 1.1 $ */ public class JBossRAObjectModelFactory implements ObjectModelFactory { private boolean trace; private Logger log = Logger.getLogger(JBossRAObjectModelFactory.class); public Object completeRoot(Object root, UnmarshallingContext arg1, String arg2, String arg3) { return root; } public Object newRoot(Object root, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes atts) { if(localName == null || !localName.equals("jboss-ra")) { throw new IllegalArgumentException("Error invalid root element for jboss-ra.xml" + localName); } JBossRAMetaData ramd = new JBossRAMetaData(); return ramd; } public Object newChild(JBossRAMetaData ramd, UnmarshallingContext navigator, String namespaceURI, String localName, Attributes attrs) { if(localName.equals("ra-config-property")) { ConfigPropertyMetaData cpmd = new ConfigPropertyMetaData(); ramd.addProperty(cpmd); return cpmd; } else { return null; } } public void setValue(ConfigPropertyMetaData cpmd, UnmarshallingContext navigator, String namespaceURI, String localName, String value) { if (trace) log.trace("config property setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); else if (localName.equals("ra-config-property-name")) cpmd.setName(value); else if (localName.equals("ra-config-property-type")) cpmd.setType(value); else if (localName.equals("ra-config-property-value")) cpmd.setValue(value); else throw new IllegalArgumentException("Unknown config property setValue: nuri=" + namespaceURI + " localName=" + localName + " value=" + value); } } |
From: Weston P. <wes...@jb...> - 2006-07-07 02:40:51
|
User: wprice Date: 06/07/06 22:40:50 Modified: src/main/org/jboss/resource/connectionmanager TxConnectionManager.java Log: [JBAS-3336] XAManagedConnections that experience failure issues (XAER_RMFAIL, XAERR_RMERR) during enlistment are no longer returned to the pool but destroyed. Revision Changes Path 1.43 +2 -1 jbosscx/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java (In the diff below, changes in quantity of whitespace are not shown.) Index: TxConnectionManager.java =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/connectionmanager/TxConnectionManager.java,v retrieving revision 1.42 retrieving revision 1.43 diff -u -b -r1.42 -r1.43 --- TxConnectionManager.java 24 Feb 2006 15:53:09 -0000 1.42 +++ TxConnectionManager.java 7 Jul 2006 02:40:50 -0000 1.43 @@ -123,7 +123,8 @@ * * @author <a href="mailto:d_j...@us...">David Jencks</a> * @author <a href="mailto:ad...@jb...">Adrian Brock</a> - * @version $Revision: 1.42 $ + * @author <a href="wes...@jb...">Weston Price</a> + * @version $Revision: 1.43 $ */ public class TxConnectionManager extends BaseConnectionManager2 implements TxConnectionManagerMBean { |
From: Weston P. <wes...@jb...> - 2006-07-07 02:39:09
|
User: wprice Date: 06/07/06 22:39:07 Modified: src/main/org/jboss/test/jca/test XATxConnectionManagerUnitTestCase.java Log: [JBAS-3336] XAManagedConnections that experience failure issues (XAER_RMFAIL, XAERR_RMERR) during enlistment are no longer returned to the pool but destroyed. Added support methods to testing framework. Revision Changes Path 1.22 +39 -0 jbosstest/src/main/org/jboss/test/jca/test/XATxConnectionManagerUnitTestCase.java (In the diff below, changes in quantity of whitespace are not shown.) Index: XATxConnectionManagerUnitTestCase.java =================================================================== RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/jca/test/XATxConnectionManagerUnitTestCase.java,v retrieving revision 1.21 retrieving revision 1.22 diff -u -b -r1.21 -r1.22 --- XATxConnectionManagerUnitTestCase.java 5 Apr 2006 16:11:02 -0000 1.21 +++ XATxConnectionManagerUnitTestCase.java 7 Jul 2006 02:39:07 -0000 1.22 @@ -27,6 +27,7 @@ import javax.resource.spi.ConnectionRequestInfo; import javax.transaction.RollbackException; import javax.transaction.TransactionManager; +import javax.transaction.xa.XAException; import org.jboss.logging.Logger; import org.jboss.resource.connectionmanager.CachedConnectionManager; @@ -38,6 +39,7 @@ import org.jboss.test.JBossTestCase; import org.jboss.test.jca.adapter.TestConnection; import org.jboss.test.jca.adapter.TestConnectionRequestInfo; +import org.jboss.test.jca.adapter.TestManagedConnection; import org.jboss.test.jca.adapter.TestManagedConnectionFactory; import org.jboss.tm.TransactionManagerLocator; import org.jboss.tm.TxUtils; @@ -305,4 +307,41 @@ } assertTrue("Connection still enlisted in tx!", !c.isInTx()); } + + public void testFailedStartTx() throws Exception + { + TestManagedConnection.setFailInStart(false, XAException.XAER_RMFAIL); + tm.begin(); + TestConnection conn = null; + TestConnection conn2 = null; + + try + { + assertTrue("Connection in pool!", cm.getPoolingStrategy().getConnectionCount() == 0); + conn = (TestConnection)cm.allocateConnection(mcf, cri); + + //One should have been created + assertTrue(cm.getPoolingStrategy().getConnectionCount() == 1); + + TestManagedConnection.setFailInStart(true, XAException.XAER_RMFAIL); + + conn2 = (TestConnection)cm.allocateConnection(mcf, cri); + + fail("Should not be here."); + + } + + catch (Throwable e) + { + } + + conn.close(); + + assertTrue(conn2 == null); + assertTrue(cm.getPoolingStrategy().getConnectionCount() == 1); + + + + } + } |
From: Weston P. <wes...@jb...> - 2006-07-07 02:38:41
|
User: wprice Date: 06/07/06 22:38:39 Modified: src/main/org/jboss/test/jca/ejb XAExceptionSessionBean.java Log: [JBAS-3336] XAManagedConnections that experience failure issues (XAER_RMFAIL, XAERR_RMERR) during enlistment are no longer returned to the pool but destroyed. Added support methods to testing framework. Revision Changes Path 1.6 +2 -1 jbosstest/src/main/org/jboss/test/jca/ejb/XAExceptionSessionBean.java (In the diff below, changes in quantity of whitespace are not shown.) Index: XAExceptionSessionBean.java =================================================================== RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/jca/ejb/XAExceptionSessionBean.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- XAExceptionSessionBean.java 29 Oct 2005 23:42:02 -0000 1.5 +++ XAExceptionSessionBean.java 7 Jul 2006 02:38:39 -0000 1.6 @@ -42,7 +42,7 @@ * * @author <a href="mailto:d_j...@us...">David Jencks</a> * @author <a href="mailto:ad...@jb...">Adrian Brock</a> - * @version <tt>$Revision: 1.5 $</tt> + * @version <tt>$Revision: 1.6 $</tt> * * @ejb:bean name="XAExceptionSession" * jndi-name="test/XAExceptionSessionHome" @@ -69,6 +69,7 @@ { } + /** * Describe <code>testXAException</code> method here. * @ejb.interface-method |
From: Weston P. <wes...@jb...> - 2006-07-07 02:37:45
|
User: wprice Date: 06/07/06 22:37:42 Modified: src/main/org/jboss/test/jca/adapter TestManagedConnection.java Log: [JBAS-3336] XAManagedConnections that experience failure issues (XAER_RMFAIL, XAERR_RMERR) during enlistment are no longer returned to the pool but destroyed. Added support methods to testing framework. Revision Changes Path 1.18 +47 -3 jbosstest/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java (In the diff below, changes in quantity of whitespace are not shown.) Index: TestManagedConnection.java =================================================================== RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/jca/adapter/TestManagedConnection.java,v retrieving revision 1.17 retrieving revision 1.18 diff -u -b -r1.17 -r1.18 --- TestManagedConnection.java 24 Feb 2006 14:26:40 -0000 1.17 +++ TestManagedConnection.java 7 Jul 2006 02:37:42 -0000 1.18 @@ -35,6 +35,7 @@ import javax.resource.spi.LocalTransaction; import javax.resource.spi.ManagedConnection; import javax.resource.spi.ManagedConnectionMetaData; +import javax.resource.spi.ResourceAdapterInternalException; import javax.security.auth.Subject; import javax.transaction.xa.XAException; import javax.transaction.xa.XAResource; @@ -50,7 +51,7 @@ * * @author <a href="mailto:d_j...@us...">David Jencks</a> * @author <a href="mailto:ad...@jb...">Adrian Brock</a> - * @version <tt>$Revision: 1.17 $</tt> + * @version <tt>$Revision: 1.18 $</tt> */ public class TestManagedConnection implements ManagedConnection, XAResource, LocalTransaction { @@ -77,10 +78,17 @@ private boolean failInPrepare = false; private boolean failInCommit = false; - private int xaCode; + private static boolean failInStart = false; + + private static int xaCode; private String localState = LOCAL_NONE; + public static void setFailInStart(boolean fis, int xa) + { + failInStart = fis; + xaCode = xa; + } public TestManagedConnection (final TestManagedConnectionFactory mcf, final Subject subject, final TestConnectionRequestInfo cri, final int id) { this.mcf = mcf; @@ -203,6 +211,13 @@ synchronized (this) { + if(failInStart) + { + XAException xaex = new XAException(xaCode + "for" + this); + broadcastConnectionError(xaex); + throw new XAException(xaCode + "for" + this); + } + GlobalXID gid = new GlobalXID(xid); String flagString = TxUtils.getXAResourceFlagsAsString(flags); log.info("start with xid=" + gid + " flags=" + flagString + " for " + this); @@ -467,6 +482,35 @@ } } + protected void broadcastConnectionError(Throwable e) + { + if(destroyed.get()) + return; + + Exception ex = null; + if (e instanceof Exception) + ex = (Exception) e; + else + ex = new ResourceAdapterInternalException("Unexpected error", e); + ConnectionEvent ce = new ConnectionEvent(this, ConnectionEvent.CONNECTION_ERROR_OCCURRED, ex); + Collection copy = null; + synchronized(listeners) + { + copy = new ArrayList(listeners); + } + for (Iterator i = copy.iterator(); i.hasNext(); ) + { + ConnectionEventListener cel = (ConnectionEventListener)i.next(); + try + { + cel.connectionErrorOccurred(ce); + } + catch (Throwable t) + { + } + } + } + void connectionError(TestConnection handle, Exception e) { if (destroyed.get()) |
From: Weston P. <wes...@jb...> - 2006-07-07 02:37:27
|
User: wprice Date: 06/07/06 22:37:24 Modified: src/main/org/jboss/test/jca/adapter TestConnectionFactory.java TestConnection.java Log: [JBAS-3336] XAManagedConnections that experience failure issues (XAER_RMFAIL, XAERR_RMERR) during enlistment are no longer returned to the pool but destroyed. Added support methods to testing framework. Revision Changes Path 1.6 +3 -1 jbosstest/src/main/org/jboss/test/jca/adapter/TestConnectionFactory.java (In the diff below, changes in quantity of whitespace are not shown.) Index: TestConnectionFactory.java =================================================================== RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/jca/adapter/TestConnectionFactory.java,v retrieving revision 1.5 retrieving revision 1.6 diff -u -b -r1.5 -r1.6 --- TestConnectionFactory.java 29 Oct 2005 23:42:01 -0000 1.5 +++ TestConnectionFactory.java 7 Jul 2006 02:37:24 -0000 1.6 @@ -32,6 +32,8 @@ import javax.resource.spi.ConnectionManager; import javax.resource.Referenceable; +import org.jboss.resource.connectionmanager.BaseConnectionManager2; + /** * TestConnectionFactory.java * 1.12 +5 -1 jbosstest/src/main/org/jboss/test/jca/adapter/TestConnection.java (In the diff below, changes in quantity of whitespace are not shown.) Index: TestConnection.java =================================================================== RCS file: /cvsroot/jboss/jbosstest/src/main/org/jboss/test/jca/adapter/TestConnection.java,v retrieving revision 1.11 retrieving revision 1.12 diff -u -b -r1.11 -r1.12 --- TestConnection.java 24 Feb 2006 14:26:40 -0000 1.11 +++ TestConnection.java 7 Jul 2006 02:37:24 -0000 1.12 @@ -59,6 +59,10 @@ mc.setFailInPrepare(fail, xaCode); } + public void setFailInStart(final boolean fail, final int xaCode) + { + + } public void setFailInCommit(final boolean fail, final int xaCode) { mc.setFailInCommit(fail, xaCode); |
From: Weston P. <wes...@jb...> - 2006-07-07 02:34:28
|
User: wprice Date: 06/07/06 22:34:26 Modified: src/main/org/jboss/resource/adapter/jdbc/xa XAManagedConnection.java Log: [JBAS-3336] XAManagedConnections that experience failure issues (XAER_RMFAIL, XAERR_RMERR) during enlistment are no longer returned to the pool but destroyed. Revision Changes Path 1.19 +27 -4 jbosscx/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnection.java (In the diff below, changes in quantity of whitespace are not shown.) Index: XAManagedConnection.java =================================================================== RCS file: /cvsroot/jboss/jbosscx/src/main/org/jboss/resource/adapter/jdbc/xa/XAManagedConnection.java,v retrieving revision 1.18 retrieving revision 1.19 diff -u -b -r1.18 -r1.19 --- XAManagedConnection.java 31 May 2006 22:39:56 -0000 1.18 +++ XAManagedConnection.java 7 Jul 2006 02:34:26 -0000 1.19 @@ -39,7 +39,8 @@ * * @author <a href="mailto:d_j...@us...">David Jencks </a> * @author <a href="mailto:ad...@jb...">Adrian Brock</a> - * @version $Revision: 1.18 $ + * @author <a href="wes...@jb...">Weston Price</a> + * @version $Revision: 1.19 $ */ public class XAManagedConnection extends BaseWrapperManagedConnection implements XAResource { @@ -114,7 +115,24 @@ { getLog().warn("Error setting state ", e); } + + try + { xaResource.start(xid, flags); + + }catch(XAException e) + { + //JBAS-3336 Connections that fail in enlistment should not be returned + //to the pool + if(isFailedXA(e.errorCode)) + { + getLog().error("Start transaction failed for " + this); + broadcastConnectionError(e); + } + + throw e; + } + synchronized (stateLock) { currentXid = xid; @@ -186,4 +204,9 @@ return xaResource.setTransactionTimeout(seconds); } + private boolean isFailedXA(int errorCode) + { + + return (errorCode == XAException.XAER_RMERR || errorCode == XAException.XAER_RMFAIL); + } } |
From: Weston P. <wes...@jb...> - 2006-07-07 02:32:16
|
User: wprice Date: 06/07/06 22:32:14 Added: src/resources/schema jboss-ra.xsd connector_1_5.xsd Log: [JBAS-3343] New jboss-ra.xsd schema to allow for overriding RA properties in ra.xml. At present, this is the only use for this file. Revision Changes Path 1.1 date: 2006/07/07 02:32:14; author: wprice; state: Exp;jbosscx/src/resources/schema/jboss-ra.xsd Index: jboss-ra.xsd =================================================================== <xs:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://www.jboss.org/schema/ra" xmlns:ra="http://www.jboss.org/schema/ra" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee/" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.0"> <import schemaLocation="http://java.sun.com/xml/ns/j2ee/j2ee_1_4.xsd"></import> <xs:element name="jboss-ra" type="ra:jbossRaType"> </xs:element> <xs:complexType name="jbossRaType"> <xs:sequence> <xs:element name="ra-config-property" type="ra:ra-config-property-type" minOccurs="0" maxOccurs="unbounded"/> </xs:sequence> </xs:complexType> <xs:complexType name="ra-config-property-type"> <xs:sequence> <xs:element name="ra-config-property-name" type="xs:string" minOccurs="1" maxOccurs="1"/> <xs:element name="ra-config-property-type" type="xs:string" minOccurs="1" maxOccurs="1"/> <xs:element name="ra-config-property-value" type="xs:string" minOccurs="0" maxOccurs="1"/> </xs:sequence> </xs:complexType> </xs:schema> 1.1 date: 2006/07/07 02:32:14; author: wprice; state: Exp;jbosscx/src/resources/schema/connector_1_5.xsd Index: connector_1_5.xsd =================================================================== <?xml version="1.0" encoding="UTF-8"?> <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema" targetNamespace="http://java.sun.com/xml/ns/j2ee" xmlns:j2ee="http://java.sun.com/xml/ns/j2ee" xmlns:xsd="http://www.w3.org/2001/XMLSchema" elementFormDefault="qualified" attributeFormDefault="unqualified" version="1.5"> <xsd:annotation> <xsd:documentation> @(#)connector_1_5.xsds 1.27 06/17/03 </xsd:documentation> </xsd:annotation> <xsd:annotation> <xsd:documentation> Copyright 2003 Sun Microsystems, Inc., 901 San Antonio Road, Palo Alto, California 94303, U.S.A. All rights reserved. Sun Microsystems, Inc. has intellectual property rights relating to technology described in this document. In particular, and without limitation, these intellectual property rights may include one or more of the U.S. patents listed at http://www.sun.com/patents and one or more additional patents or pending patent applications in the U.S. and other countries. This document and the technology which it describes are distributed under licenses restricting their use, copying, distribution, and decompilation. No part of this document may be reproduced in any form by any means without prior written authorization of Sun and its licensors, if any. Third-party software, including font technology, is copyrighted and licensed from Sun suppliers. Sun, Sun Microsystems, the Sun logo, Solaris, Java, J2EE, JavaServer Pages, Enterprise JavaBeans and the Java Coffee Cup logo are trademarks or registered trademarks of Sun Microsystems, Inc. in the U.S. and other countries. Federal Acquisitions: Commercial Software - Government Users Subject to Standard License Terms and Conditions. </xsd:documentation> </xsd:annotation> <xsd:annotation> <xsd:documentation> <![CDATA[ This is the XML Schema for the Connector 1.5 deployment descriptor. The deployment descriptor must be named "META-INF/ra.xml" in the connector's rar file. All Connector deployment descriptors must indicate the connector resource adapter schema by using the J2EE namespace: http://java.sun.com/xml/ns/j2ee and by indicating the version of the schema by using the version element as shown below: <connector xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd" version="1.5"> ... </connector> The instance documents may indicate the published version of the schema using the xsi:schemaLocation attribute for J2EE namespace with the following location: http://java.sun.com/xml/ns/j2ee/connector_1_5.xsd ]]> </xsd:documentation> </xsd:annotation> <xsd:annotation> <xsd:documentation> The following conventions apply to all J2EE deployment descriptor elements unless indicated otherwise. - In elements that specify a pathname to a file within the same JAR file, relative filenames (i.e., those not starting with "/") are considered relative to the root of the JAR file's namespace. Absolute filenames (i.e., those starting with "/") also specify names in the root of the JAR file's namespace. In general, relative names are preferred. The exception is .war files where absolute names are preferred for consistency with the Servlet API. </xsd:documentation> </xsd:annotation> <xsd:include schemaLocation="j2ee_1_4.xsd"/> <!-- **************************************************** --> <xsd:element name="connector" type="j2ee:connectorType"> <xsd:annotation> <xsd:documentation> The connector element is the root element of the deployment descriptor for the resource adapter. This element includes general information - vendor name, resource adapter version, icon - about the resource adapter module. It also includes information specific to the implementation of the resource adapter library as specified through the element resourceadapter. </xsd:documentation> </xsd:annotation> </xsd:element> <!-- **************************************************** --> <xsd:complexType name="activationspecType"> <xsd:annotation> <xsd:documentation> The activationspecType specifies an activation specification. The information includes fully qualified Java class name of an activation specification and a set of required configuration property names. </xsd:documentation> </xsd:annotation> <xsd:sequence> <xsd:element name="activationspec-class" type="j2ee:fully-qualified-classType"> <xsd:annotation> <xsd:documentation> <![CDATA[ The element activationspec-class specifies the fully qualified Java class name of the activation specification class. This class must implement the javax.resource.spi.ActivationSpec interface. The implementation of this class is required to be a JavaBean. Example: <activationspec-class>com.wombat.ActivationSpecImpl </activationspec-class> ]]> </xsd:documentation> </xsd:annotation> </xsd:element> <xsd:element name="required-config-property" type="j2ee:required-config-propertyType" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> <!-- **************************************************** --> <xsd:complexType name="adminobjectType"> <xsd:annotation> <xsd:documentation> The adminobjectType specifies information about an administered object. Administered objects are specific to a messaging style or message provider. This contains information on the Java type of the interface implemented by an administered object, its Java class name and its configuration properties. </xsd:documentation> </xsd:annotation> <xsd:sequence> <xsd:element name="adminobject-interface" type="j2ee:fully-qualified-classType"> <xsd:annotation> <xsd:documentation> <![CDATA[ The element adminobject-interface specifies the fully qualified name of the Java type of the interface implemented by an administered object. Example: <adminobject-interface>javax.jms.Destination </adminobject-interface> ]]> </xsd:documentation> </xsd:annotation> </xsd:element> <xsd:element name="adminobject-class" type="j2ee:fully-qualified-classType"> <xsd:annotation> <xsd:documentation> <![CDATA[ The element adminobject-class specifies the fully qualified Java class name of an administered object. Example: <adminobject-class>com.wombat.DestinationImpl </adminobject-class> ]]> </xsd:documentation> </xsd:annotation> </xsd:element> <xsd:element name="config-property" type="j2ee:config-propertyType" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> <!-- **************************************************** --> <xsd:complexType name="authentication-mechanismType"> <xsd:annotation> <xsd:documentation> The authentication-mechanismType specifies an authentication mechanism supported by the resource adapter. Note that this support is for the resource adapter and not for the underlying EIS instance. The optional description specifies any resource adapter specific requirement for the support of security contract and authentication mechanism. Note that BasicPassword mechanism type should support the javax.resource.spi.security.PasswordCredential interface. The Kerbv5 mechanism type should support the org.ietf.jgss.GSSCredential interface or the deprecated javax.resource.spi.security.GenericCredential interface. </xsd:documentation> </xsd:annotation> <xsd:sequence> <xsd:element name="description" type="j2ee:descriptionType" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="authentication-mechanism-type" type="j2ee:xsdStringType"> <xsd:annotation> <xsd:documentation> <![CDATA[ The element authentication-mechanism-type specifies type of an authentication mechanism. The example values are: <authentication-mechanism-type>BasicPassword </authentication-mechanism-type> <authentication-mechanism-type>Kerbv5 </authentication-mechanism-type> Any additional security mechanisms are outside the scope of the Connector architecture specification. ]]> </xsd:documentation> </xsd:annotation> </xsd:element> <xsd:element name="credential-interface" type="j2ee:credential-interfaceType"/> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> <!-- **************************************************** --> <xsd:complexType name="config-property-nameType"> <xsd:annotation> <xsd:documentation> <![CDATA[ The config-property-nameType contains the name of a configuration property. The connector architecture defines a set of well-defined properties all of type java.lang.String. These are as follows. ServerName PortNumber UserName Password ConnectionURL A resource adapter provider can extend this property set to include properties specific to the resource adapter and its underlying EIS. Possible values include ServerName PortNumber UserName Password ConnectionURL Example: <config-property-name>ServerName</config-property-name> ]]> </xsd:documentation> </xsd:annotation> <xsd:simpleContent> <xsd:restriction base="j2ee:xsdStringType"/> </xsd:simpleContent> </xsd:complexType> <!-- **************************************************** --> <xsd:complexType name="config-property-typeType"> <xsd:annotation> <xsd:documentation> <![CDATA[ The config-property-typeType contains the fully qualified Java type of a configuration property. The following are the legal values: java.lang.Boolean, java.lang.String, java.lang.Integer, java.lang.Double, java.lang.Byte, java.lang.Short, java.lang.Long, java.lang.Float, java.lang.Character Used in: config-property Example: <config-property-type>java.lang.String</config-property-type> ]]> </xsd:documentation> </xsd:annotation> <xsd:simpleContent> <xsd:restriction base="j2ee:string"> <xsd:enumeration value="java.lang.Boolean"/> <xsd:enumeration value="java.lang.String"/> <xsd:enumeration value="java.lang.Integer"/> <xsd:enumeration value="java.lang.Double"/> <xsd:enumeration value="java.lang.Byte"/> <xsd:enumeration value="java.lang.Short"/> <xsd:enumeration value="java.lang.Long"/> <xsd:enumeration value="java.lang.Float"/> <xsd:enumeration value="java.lang.Character"/> </xsd:restriction> </xsd:simpleContent> </xsd:complexType> <!-- **************************************************** --> <xsd:complexType name="config-propertyType"> <xsd:annotation> <xsd:documentation> The config-propertyType contains a declaration of a single configuration property that may be used for providing configuration information. The declaration consists of an optional description, name, type and an optional value of the configuration property. If the resource adapter provider does not specify a value than the deployer is responsible for providing a valid value for a configuration property. Any bounds or well-defined values of properties should be described in the description element. </xsd:documentation> </xsd:annotation> <xsd:sequence> <xsd:element name="description" type="j2ee:descriptionType" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="config-property-name" type="j2ee:config-property-nameType"/> <xsd:element name="config-property-type" type="j2ee:config-property-typeType"/> <xsd:element name="config-property-value" type="j2ee:xsdStringType" minOccurs="0"> <xsd:annotation> <xsd:documentation> <![CDATA[ The element config-property-value contains the value of a configuration entry. Note, it is possible for a resource adapter deployer to override this configuration information during deployment. Example: <config-property-value>WombatServer</config-property-value> ]]> </xsd:documentation> </xsd:annotation> </xsd:element> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> <!-- **************************************************** --> <xsd:complexType name="connection-definitionType"> <xsd:annotation> <xsd:documentation> The connection-definitionType defines a set of connection interfaces and classes pertaining to a particular connection type. This also includes configurable properties for ManagedConnectionFactory instances that may be produced out of this set. </xsd:documentation> </xsd:annotation> <xsd:sequence> <xsd:element name="managedconnectionfactory-class" type="j2ee:fully-qualified-classType"> <xsd:annotation> <xsd:documentation> <![CDATA[ The element managedconnectionfactory-class specifies the fully qualified name of the Java class that implements the javax.resource.spi.ManagedConnectionFactory interface. This Java class is provided as part of resource adapter's implementation of connector architecture specified contracts. The implementation of this class is required to be a JavaBean. Example: <managedconnectionfactory-class> com.wombat.ManagedConnectionFactoryImpl </managedconnectionfactory-class> ]]> </xsd:documentation> </xsd:annotation> </xsd:element> <xsd:element name="config-property" type="j2ee:config-propertyType" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="connectionfactory-interface" type="j2ee:fully-qualified-classType"> <xsd:annotation> <xsd:documentation> <![CDATA[ The element connectionfactory-interface specifies the fully qualified name of the ConnectionFactory interface supported by the resource adapter. Example: <connectionfactory-interface>com.wombat.ConnectionFactory </connectionfactory-interface> OR <connectionfactory-interface>javax.resource.cci.ConnectionFactory </connectionfactory-interface> ]]> </xsd:documentation> </xsd:annotation> </xsd:element> <xsd:element name="connectionfactory-impl-class" type="j2ee:fully-qualified-classType"> <xsd:annotation> <xsd:documentation> <![CDATA[ The element connectionfactory-impl-class specifies the fully qualified name of the ConnectionFactory class that implements resource adapter specific ConnectionFactory interface. Example: <connectionfactory-impl-class>com.wombat.ConnectionFactoryImpl </connectionfactory-impl-class> ]]> </xsd:documentation> </xsd:annotation> </xsd:element> <xsd:element name="connection-interface" type="j2ee:fully-qualified-classType"> <xsd:annotation> <xsd:documentation> <![CDATA[ The connection-interface element specifies the fully qualified name of the Connection interface supported by the resource adapter. Example: <connection-interface>javax.resource.cci.Connection </connection-interface> ]]> </xsd:documentation> </xsd:annotation> </xsd:element> <xsd:element name="connection-impl-class" type="j2ee:fully-qualified-classType"> <xsd:annotation> <xsd:documentation> <![CDATA[ The connection-impl-classType specifies the fully qualified name of the Connection class that implements resource adapter specific Connection interface. It is used by the connection-impl-class elements. Example: <connection-impl-class>com.wombat.ConnectionImpl </connection-impl-class> ]]> </xsd:documentation> </xsd:annotation> </xsd:element> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> <!-- **************************************************** --> <xsd:complexType name="connectorType"> <xsd:annotation> <xsd:documentation> The connectorType defines a resource adapter. </xsd:documentation> </xsd:annotation> <xsd:sequence> <xsd:group ref="j2ee:descriptionGroup"/> <xsd:element name="vendor-name" type="j2ee:xsdStringType"> <xsd:annotation> <xsd:documentation> The element vendor-name specifies the name of resource adapter provider vendor. </xsd:documentation> </xsd:annotation> </xsd:element> <xsd:element name="eis-type" type="j2ee:xsdStringType"> <xsd:annotation> <xsd:documentation> The element eis-type contains information about the type of the EIS. For example, the type of an EIS can be product name of EIS independent of any version info. This helps in identifying EIS instances that can be used with this resource adapter. </xsd:documentation> </xsd:annotation> </xsd:element> <xsd:element name="resourceadapter-version" type="j2ee:xsdStringType"> <xsd:annotation> <xsd:documentation> The element resourceadapter-version specifies a string-based version of the resource adapter from the resource adapter provider. </xsd:documentation> </xsd:annotation> </xsd:element> <xsd:element name="license" type="j2ee:licenseType" minOccurs="0"/> <xsd:element name="resourceadapter" type="j2ee:resourceadapterType"/> </xsd:sequence> <xsd:attribute name="version" type="j2ee:dewey-versionType" fixed="1.5" use="required"> <xsd:annotation> <xsd:documentation> The version specifies the version of the connector architecture specification that is supported by this resource adapter. This information enables deployer to configure the resource adapter to support deployment and runtime requirements of the corresponding connector architecture specification. </xsd:documentation> </xsd:annotation> </xsd:attribute> <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> <!-- **************************************************** --> <xsd:complexType name="credential-interfaceType"> <xsd:annotation> <xsd:documentation> The credential-interfaceType specifies the interface that the resource adapter implementation supports for the representation of the credentials. This element(s) that use this type, i.e. credential-interface, should be used by application server to find out the Credential interface it should use as part of the security contract. The possible values are: javax.resource.spi.security.PasswordCredential org.ietf.jgss.GSSCredential javax.resource.spi.security.GenericCredential </xsd:documentation> </xsd:annotation> <xsd:simpleContent> <xsd:restriction base="j2ee:fully-qualified-classType"> <xsd:enumeration value="javax.resource.spi.security.PasswordCredential"/> <xsd:enumeration value="org.ietf.jgss.GSSCredential"/> <xsd:enumeration value="javax.resource.spi.security.GenericCredential"/> </xsd:restriction> </xsd:simpleContent> </xsd:complexType> <!-- **************************************************** --> <xsd:complexType name="inbound-resourceadapterType"> <xsd:annotation> <xsd:documentation> The inbound-resourceadapterType specifies information about an inbound resource adapter. This contains information specific to the implementation of the resource adapter library as specified through the messageadapter element. </xsd:documentation> </xsd:annotation> <xsd:sequence> <xsd:element name="messageadapter" type="j2ee:messageadapterType" minOccurs="0"> <xsd:unique name="messagelistener-type-uniqueness"> <xsd:annotation> <xsd:documentation> The messagelistener-type element content must be unique in the messageadapter. Several messagelisteners can not use the same messagelistener-type. </xsd:documentation> </xsd:annotation> <xsd:selector xpath="j2ee:messagelistener"/> <xsd:field xpath="j2ee:messagelistener-type"/> </xsd:unique> </xsd:element> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> <!-- **************************************************** --> <xsd:complexType name="licenseType"> <xsd:annotation> <xsd:documentation> The licenseType specifies licensing requirements for the resource adapter module. This type specifies whether a license is required to deploy and use this resource adapter, and an optional description of the licensing terms (examples: duration of license, number of connection restrictions). It is used by the license element. </xsd:documentation> </xsd:annotation> <xsd:sequence> <xsd:element name="description" type="j2ee:descriptionType" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="license-required" type="j2ee:true-falseType"> <xsd:annotation> <xsd:documentation> The element license-required specifies whether a license is required to deploy and use the resource adapter. This element must be one of the following, "true" or "false". </xsd:documentation> </xsd:annotation> </xsd:element> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> <!-- **************************************************** --> <xsd:complexType name="messageadapterType"> <xsd:annotation> <xsd:documentation> The messageadapterType specifies information about the messaging capabilities of the resource adapter. This contains information specific to the implementation of the resource adapter library as specified through the messagelistener element. </xsd:documentation> </xsd:annotation> <xsd:sequence> <xsd:element name="messagelistener" type="j2ee:messagelistenerType" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> <!-- **************************************************** --> <xsd:complexType name="messagelistenerType"> <xsd:annotation> <xsd:documentation> The messagelistenerType specifies information about a specific message listener supported by the messaging resource adapter. It contains information on the Java type of the message listener interface and an activation specification. </xsd:documentation> </xsd:annotation> <xsd:sequence> <xsd:element name="messagelistener-type" type="j2ee:fully-qualified-classType"> <xsd:annotation> <xsd:documentation> <![CDATA[ The element messagelistener-type specifies the fully qualified name of the Java type of a message listener interface. Example: <messagelistener-type>javax.jms.MessageListener </messagelistener-type> ]]> </xsd:documentation> </xsd:annotation> </xsd:element> <xsd:element name="activationspec" type="j2ee:activationspecType"/> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> <!-- **************************************************** --> <xsd:complexType name="outbound-resourceadapterType"> <xsd:annotation> <xsd:documentation> The outbound-resourceadapterType specifies information about an outbound resource adapter. The information includes fully qualified names of classes/interfaces required as part of the connector architecture specified contracts for connection management, level of transaction support provided, one or more authentication mechanisms supported and additional required security permissions. If there is no authentication-mechanism specified as part of resource adapter element then the resource adapter does not support any standard security authentication mechanisms as part of security contract. The application server ignores the security part of the system contracts in this case. </xsd:documentation> </xsd:annotation> <xsd:sequence> <xsd:element name="connection-definition" type="j2ee:connection-definitionType" maxOccurs="unbounded"/> <xsd:element name="transaction-support" type="j2ee:transaction-supportType"/> <xsd:element name="authentication-mechanism" type="j2ee:authentication-mechanismType" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="reauthentication-support" type="j2ee:true-falseType"> <xsd:annotation> <xsd:documentation> The element reauthentication-support specifies whether the resource adapter implementation supports re-authentication of existing Managed- Connection instance. Note that this information is for the resource adapter implementation and not for the underlying EIS instance. This element must have either a "true" or "false" value. </xsd:documentation> </xsd:annotation> </xsd:element> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> <!-- **************************************************** --> <xsd:complexType name="required-config-propertyType"> <xsd:annotation> <xsd:documentation> <![CDATA[ The required-config-propertyType contains a declaration of a single configuration property used for specifying a required configuration property name. It is used by required-config-property elements. Example: <required-config-property>Destination</required-config-property> ]]> </xsd:documentation> </xsd:annotation> <xsd:sequence> <xsd:element name="description" type="j2ee:descriptionType" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="config-property-name" type="j2ee:config-property-nameType"/> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> <!-- **************************************************** --> <xsd:complexType name="resourceadapterType"> <xsd:annotation> <xsd:documentation> The resourceadapterType specifies information about the resource adapter. The information includes fully qualified resource adapter Java class name, configuration properties, information specific to the implementation of the resource adapter library as specified through the outbound-resourceadapter and inbound-resourceadapter elements, and an optional set of administered objects. </xsd:documentation> </xsd:annotation> <xsd:sequence> <xsd:element name="resourceadapter-class" type="j2ee:fully-qualified-classType" minOccurs="0"> <xsd:annotation> <xsd:documentation> The element resourceadapter-class specifies the fully qualified name of a Java class that implements the javax.resource.spi.ResourceAdapter interface. This Java class is provided as part of resource adapter's implementation of connector architecture specified contracts. The implementation of this class is required to be a JavaBean. </xsd:documentation> </xsd:annotation> </xsd:element> <xsd:element name="config-property" type="j2ee:config-propertyType" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="outbound-resourceadapter" type="j2ee:outbound-resourceadapterType" minOccurs="0"> <xsd:unique name="connectionfactory-interface-uniqueness"> <xsd:annotation> <xsd:documentation> The connectionfactory-interface element content must be unique in the outbound-resourceadapter. Multiple connection-definitions can not use the same connectionfactory-type. </xsd:documentation> </xsd:annotation> <xsd:selector xpath="j2ee:connection-definition"/> <xsd:field xpath="j2ee:connectionfactory-interface"/> </xsd:unique> </xsd:element> <xsd:element name="inbound-resourceadapter" type="j2ee:inbound-resourceadapterType" minOccurs="0"/> <xsd:element name="adminobject" type="j2ee:adminobjectType" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="security-permission" type="j2ee:security-permissionType" minOccurs="0" maxOccurs="unbounded"/> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> <!-- **************************************************** --> <xsd:complexType name="security-permissionType"> <xsd:annotation> <xsd:documentation> The security-permissionType specifies a security permission that is required by the resource adapter code. The security permission listed in the deployment descriptor are ones that are different from those required by the default permission set as specified in the connector specification. The optional description can mention specific reason that resource adapter requires a given security permission. </xsd:documentation> </xsd:annotation> <xsd:sequence> <xsd:element name="description" type="j2ee:descriptionType" minOccurs="0" maxOccurs="unbounded"/> <xsd:element name="security-permission-spec" type="j2ee:xsdStringType"> <xsd:annotation> <xsd:documentation> The element security-permission-spec specifies a security permission based on the Security policy file syntax. Refer to the following URL for Sun's implementation of the security permission specification: http://java.sun.com/products/jdk/1.4/docs/guide/security/PolicyFiles.html#FileSyntax </xsd:documentation> </xsd:annotation> </xsd:element> </xsd:sequence> <xsd:attribute name="id" type="xsd:ID"/> </xsd:complexType> <!-- **************************************************** --> <xsd:complexType name="transaction-supportType"> <xsd:annotation> <xsd:documentation> The transaction-supportType specifies the level of transaction support provided by the resource adapter. It is used by transaction-support elements. The value must be one of the following: NoTransaction LocalTransaction XATransaction </xsd:documentation> </xsd:annotation> <xsd:simpleContent> <xsd:restriction base="j2ee:string"> <xsd:enumeration value="NoTransaction"/> <xsd:enumeration value="LocalTransaction"/> <xsd:enumeration value="XATransaction"/> </xsd:restriction> </xsd:simpleContent> </xsd:complexType> </xsd:schema> |
From: Weston P. <wes...@jb...> - 2006-07-07 02:32:15
|
User: wprice Date: 06/07/06 22:32:12 Log: Directory /cvsroot/jboss/jbosscx/src/resources/schema added to the repository |
From: Ben W. <bw...@jb...> - 2006-07-07 01:47:15
|
User: bwang Date: 06/07/06 21:47:06 Modified: src/org/jboss/cache/aop Tag: Branch_JBossCache_1_4_0 PojoCache.java PojoTxSynchronizationHandler.java Log: JBCACHE-683 TxSynchronizationHandler can produce NPE. Revision Changes Path No revision No revision 1.23.2.1 +2 -1 JBossCache/src/org/jboss/cache/aop/PojoCache.java (In the diff below, changes in quantity of whitespace are not shown.) Index: PojoCache.java =================================================================== RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/aop/PojoCache.java,v retrieving revision 1.23 retrieving revision 1.23.2.1 diff -u -b -r1.23 -r1.23.2.1 --- PojoCache.java 8 Jun 2006 04:05:43 -0000 1.23 +++ PojoCache.java 7 Jul 2006 01:47:06 -0000 1.23.2.1 @@ -168,6 +168,7 @@ public void resetUndoOp() { List list = (List)undoListLocal_.get(); + if(list != null) list.clear(); hasSynchronizationHandler_.set(null); } 1.1.2.1 +27 -27 JBossCache/src/org/jboss/cache/aop/PojoTxSynchronizationHandler.java (In the diff below, changes in quantity of whitespace are not shown.) Index: PojoTxSynchronizationHandler.java =================================================================== RCS file: /cvsroot/jboss/JBossCache/src/org/jboss/cache/aop/PojoTxSynchronizationHandler.java,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -u -b -r1.1 -r1.1.2.1 --- PojoTxSynchronizationHandler.java 29 May 2006 09:58:48 -0000 1.1 +++ PojoTxSynchronizationHandler.java 7 Jul 2006 01:47:06 -0000 1.1.2.1 @@ -21,7 +21,7 @@ * Handling the rollback operation for PojoCache level, specifically interceptor add/remove, etc. * * @author Ben Wang - * @version $Id: PojoTxSynchronizationHandler.java,v 1.1 2006/05/29 09:58:48 bwang Exp $ + * @version $Id: PojoTxSynchronizationHandler.java,v 1.1.2.1 2006/07/07 01:47:06 bwang Exp $ */ public class PojoTxSynchronizationHandler implements Synchronization { @@ -63,13 +63,12 @@ { // Rollback the pojo interceptor add/remove List list = cache_.getModList(); - for(int i=(list.size()-1); i >= 0; i--) - { - ModificationEntry ent = (ModificationEntry)list.get(i); + if (list != null) { + for (int i = (list.size() - 1); i >= 0; i--) { + ModificationEntry ent = (ModificationEntry) list.get(i); InstanceAdvisor advisor = ent.getInstanceAdvisor(); BaseInterceptor interceptor = ent.getCacheInterceptor(); - switch (ent.getOpType()) - { + switch (ent.getOpType()) { case ModificationEntry.INTERCEPTOR_ADD: advisor.removeInterceptor(interceptor.getName()); break; @@ -83,12 +82,13 @@ try { field.set(key, value); } catch (IllegalAccessException e) { - throw new RuntimeException("PojoTxSynchronizationHandler.runRollbackPhase(): Exception: " +e); + throw new RuntimeException("PojoTxSynchronizationHandler.runRollbackPhase(): Exception: " + e); } break; default: throw new IllegalArgumentException("PojoTxSynchronizationHandler.runRollbackPhase: getOptType: " - +ent.getOpType()); + + ent.getOpType()); + } } } cache_.resetUndoOp(); |
From: Marshall C. <mcu...@jb...> - 2006-07-06 23:38:45
|
User: mculpepper Date: 06/07/06 19:38:43 Modified: core/features/org.jboss.ide.eclipse.source feature.xml Log: dependency on org.jboss.ide.eclipse.feature should be 0.0.0 Revision Changes Path 1.3 +1 -1 jbosside/core/features/org.jboss.ide.eclipse.source/feature.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: feature.xml =================================================================== RCS file: /cvsroot/jboss/jbosside/core/features/org.jboss.ide.eclipse.source/feature.xml,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- feature.xml 6 Jul 2006 23:37:49 -0000 1.2 +++ feature.xml 6 Jul 2006 23:38:43 -0000 1.3 @@ -418,7 +418,7 @@ </url> <requires> - <import feature="org.jboss.ide.eclipse.feature" version="1.5.1"/> + <import feature="org.jboss.ide.eclipse.feature" version="0.0.0"/> </requires> <plugin |
From: Marshall C. <mcu...@jb...> - 2006-07-06 23:37:52
|
User: mculpepper Date: 06/07/06 19:37:49 Modified: core/features/org.jboss.ide.eclipse.source feature.xml Log: changed to 2.0.0 Revision Changes Path 1.2 +1 -1 jbosside/core/features/org.jboss.ide.eclipse.source/feature.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: feature.xml =================================================================== RCS file: /cvsroot/jboss/jbosside/core/features/org.jboss.ide.eclipse.source/feature.xml,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- feature.xml 1 Feb 2006 00:39:22 -0000 1.1 +++ feature.xml 6 Jul 2006 23:37:49 -0000 1.2 @@ -2,7 +2,7 @@ <feature id="org.jboss.ide.eclipse.source" label="JBoss Eclipse IDE Source" - version="1.5.1" + version="2.0.0" provider-name="JBoss, Inc."> <description url="http://www.jboss.com/products/jbosside"> |
From: Aron S. <bi...@gm...> - 2006-07-06 23:11:47
|
User: asogor Date: 06/07/06 19:11:43 Modified: src/calendar/calendarejb/src/java/org/jboss/mail/calendar/mdb MailResposeHandlerMDB.java EventMailMDB.java Log: Invite Response works Revision Changes Path 1.3 +3 -3 jboss-mail/src/calendar/calendarejb/src/java/org/jboss/mail/calendar/mdb/MailResposeHandlerMDB.java (In the diff below, changes in quantity of whitespace are not shown.) Index: MailResposeHandlerMDB.java =================================================================== RCS file: /cvsroot/jboss/jboss-mail/src/calendar/calendarejb/src/java/org/jboss/mail/calendar/mdb/MailResposeHandlerMDB.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- MailResposeHandlerMDB.java 6 Jul 2006 04:52:00 -0000 1.2 +++ MailResposeHandlerMDB.java 6 Jul 2006 23:11:43 -0000 1.3 @@ -23,7 +23,7 @@ * Maile event response Handler takes * * @author Aron Sogor - * @version $Revision: 1.2 $ + * @version $Revision: 1.3 $ * * @ejb.bean name="/ejb/reporting/MailResposeHandlerMDB" * acknowledge-mode="Auto-acknowledge" @@ -62,8 +62,8 @@ schLocal.updateInvite(invites[i], user.getUserName()); } } catch (Exception e) { - log.error("Failed to update event:" + response + " status:" - + " for user:"); + log.error("Failed to update event:" + response.getEventGUID() + " status:" + + " for user:" + response.getActor() ,e); } } 1.4 +5 -5 jboss-mail/src/calendar/calendarejb/src/java/org/jboss/mail/calendar/mdb/EventMailMDB.java (In the diff below, changes in quantity of whitespace are not shown.) Index: EventMailMDB.java =================================================================== RCS file: /cvsroot/jboss/jboss-mail/src/calendar/calendarejb/src/java/org/jboss/mail/calendar/mdb/EventMailMDB.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- EventMailMDB.java 3 Jul 2006 04:06:55 -0000 1.3 +++ EventMailMDB.java 6 Jul 2006 23:11:43 -0000 1.4 @@ -35,7 +35,7 @@ * DOCUMENT ME! * * @author $Author: asogor $ - * @version $Revision: 1.3 $ + * @version $Revision: 1.4 $ * * @ejb.bean name="/ejb/reporting/EventMailMDB" * acknowledge-mode="Auto-acknowledge" @@ -51,7 +51,7 @@ */ public class EventMailMDB extends BaseUserNotificationMDB implements MessageDrivenBean, MessageListener { - static final long serialVersionUID = "$Id: EventMailMDB.java,v 1.3 2006/07/03 04:06:55 asogor Exp $".hashCode(); //$NON-NLS-1$ + static final long serialVersionUID = "$Id: EventMailMDB.java,v 1.4 2006/07/06 23:11:43 asogor Exp $".hashCode(); //$NON-NLS-1$ /** DOCUMENT ME! */ public static final String TEMP_EVENTUPDATE = "EventUpdate"; @@ -78,7 +78,7 @@ BeansWrapper wrapper = new BeansWrapper(); try { - values.put("InviteUID", invite.getInviteId()); + values.put("InviteUID", invite.getEvent().getGUID()); values.put("calendarAcct", ServerInfo.getInfo(ServerInfo.NOTIFICATION_MAIL_ADDRESS)); values.put("invite", wrapper.wrap(invite)); this.processMessage(new String[] { toAddress }, values, @@ -108,7 +108,7 @@ try { BeansWrapper wrapper = new BeansWrapper(); - values.put("InviteUID", invite.getInviteId()); + values.put("InviteUID", invite.getEvent().getGUID()); values.put("calendarAcct", ServerInfo.getInfo(ServerInfo.NOTIFICATION_MAIL_ADDRESS)); values.put("meeting", wrapper.wrap(invite.getEvent())); @@ -137,7 +137,7 @@ try { BeansWrapper wrapper = new BeansWrapper(); - values.put("InviteUID", invite.getInviteId()); + values.put("InviteUID", invite.getEvent().getGUID()); values.put("calendarAcct", ServerInfo.getInfo(ServerInfo.NOTIFICATION_MAIL_ADDRESS)); values.put("invite", wrapper.wrap(invite)); |
From: Aron S. <bi...@gm...> - 2006-07-06 23:11:47
|
User: asogor Date: 06/07/06 19:11:43 Modified: src/calendar/calendarejb/src/java/org/jboss/mail/calendar/eventbus MailResponse.java Log: Invite Response works Revision Changes Path 1.2 +2 -2 jboss-mail/src/calendar/calendarejb/src/java/org/jboss/mail/calendar/eventbus/MailResponse.java (In the diff below, changes in quantity of whitespace are not shown.) Index: MailResponse.java =================================================================== RCS file: /cvsroot/jboss/jboss-mail/src/calendar/calendarejb/src/java/org/jboss/mail/calendar/eventbus/MailResponse.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- MailResponse.java 6 Jul 2006 04:51:59 -0000 1.1 +++ MailResponse.java 6 Jul 2006 23:11:43 -0000 1.2 @@ -15,8 +15,8 @@ public MailResponse(String actor,int action,String eventGUID) { super(actor); - action = action; - eventGUID = eventGUID; + this.action = action; + this.eventGUID = eventGUID; } public int getAction() { |
From: Aron S. <bi...@gm...> - 2006-07-06 23:11:46
|
User: asogor Date: 06/07/06 19:11:43 Modified: src/java/org/jboss/mail/maillistener CalendarMailListener.java Log: Invite Response works Revision Changes Path 1.4 +4 -2 jboss-mail/src/java/org/jboss/mail/maillistener/CalendarMailListener.java (In the diff below, changes in quantity of whitespace are not shown.) Index: CalendarMailListener.java =================================================================== RCS file: /cvsroot/jboss/jboss-mail/src/java/org/jboss/mail/maillistener/CalendarMailListener.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- CalendarMailListener.java 6 Jul 2006 04:52:00 -0000 1.3 +++ CalendarMailListener.java 6 Jul 2006 23:11:43 -0000 1.4 @@ -117,9 +117,9 @@ public void handleResponse(MailResponse response) { try{ - if(destinationType.toLowerCase().equals("topic")); + if(destinationType.toLowerCase().equals("topic")) this.sendMessageTopic(response); - if(destinationType.toLowerCase().equals("queue")); + if(destinationType.toLowerCase().equals("queue")) this.sendMessageQueue(response); } catch (Exception ex) @@ -149,6 +149,7 @@ ObjectMessage om = qs.createObjectMessage(msg); sender.send(om); } finally { + qc.close(); } } @@ -173,6 +174,7 @@ ObjectMessage om = ts.createObjectMessage(msg); pub.publish(om); } finally { + tc.close(); } } |
From: JBoss IT <pos...@li...> - 2006-07-06 23:00:34
|
JBoss List Members, On July 10th, 2006, our new list server, lists.jboss.org, will officially go live. All development lists, including jboss-cvs- co...@li... will officially be moved to the new server, at this time. The new list address will be jboss-cvs- co...@li.... Everyone currently subscribed to the SourceForge list will be sent a subscription invitation to the corresponding new list on our server by July 7th, 2006. Access to the old lists on SourceForge will be cut off on July 12th, 2006, though archives will remain available on the SourceForge list server for the time being, and a link will be provided from our new list server (lists.jboss.org). Thanks for your patience during this transition. Sincerely, JBoss IT pos...@li... |
From: Roy R. <ru...@jb...> - 2006-07-06 20:46:40
|
User: russo Date: 06/07/06 16:46:35 Modified: referenceGuide/en/modules migration.xml Log: warning on migration mod. Revision Changes Path 1.12 +107 -45 jboss-portal-docs/referenceGuide/en/modules/migration.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: migration.xml =================================================================== RCS file: /cvsroot/jboss/jboss-portal-docs/referenceGuide/en/modules/migration.xml,v retrieving revision 1.11 retrieving revision 1.12 diff -u -b -r1.11 -r1.12 --- migration.xml 21 Jun 2006 22:13:54 -0000 1.11 +++ migration.xml 6 Jul 2006 20:46:35 -0000 1.12 @@ -12,13 +12,18 @@ </author> </chapterinfo> <title>Upgrading 2.2 - 2.4</title> + <warning>The migration application is not complete, as of the time of this document writing. It is suggested, users + wait before attempting to migrate their data using this application.</warning> <para>This chapter addresses migration issues from version 2.2 to 2.4 of JBoss Portal. TODO...</para> <sect1 id="migrating_database"> <title>Migrating Database</title> <para>JBoss Portal 2.4 comes with dedicated web application for database migration. This tool is designed to provide maximum ease of use to make migration process fast and pleasant. </para> - <para>The migration process should be performed <emphasis role="bold">before</emphasis> JBoss Portal 2.4 deployment</para> + <para>The migration process should be performed + <emphasis role="bold">before</emphasis> + JBoss Portal 2.4 deployment + </para> <sect2 id="migration_preparations"> <title>Preparing Database</title> <para>Migration process occures between two databases:</para> @@ -43,13 +48,15 @@ <itemizedlist> <listitem> <para> - JBoss Portal 2.2 database called <emphasis role="bold">jbossportal22</emphasis> + JBoss Portal 2.2 database called + <emphasis role="bold">jbossportal22</emphasis> which contains our production data </para> </listitem> <listitem> <para> - Newly created database called <emphasis role="bold">jbossportal24</emphasis> + Newly created database called + <emphasis role="bold">jbossportal24</emphasis> to which we want to migrate our data and deploy JBoss Portal 2.4 on it. </para> </listitem> @@ -60,7 +67,9 @@ <para>To point Migration Application from and to where it should migrate data we use JBoss Application Server datasource files.</para> <para>For your normal JBoss Portal 2.2 deployment you probably have - <emphasis role="bold">portal-ds.xml</emphasis> or <emphasis role="bold">portal-*-ds.xml</emphasis> + <emphasis role="bold">portal-ds.xml</emphasis> + or + <emphasis role="bold">portal-*-ds.xml</emphasis> file that looks like this: </para> <programlisting> @@ -79,7 +88,9 @@ </programlisting> <para>You need to create a second datasource to be able to point Migration App. to the destination database. In our case we can create - <emphasis role="bold">portal-migration-ds.xml</emphasis> file that looks like this:</para> + <emphasis role="bold">portal-migration-ds.xml</emphasis> + file that looks like this: + </para> <programlisting> <![CDATA[ <?xml version="1.0" encoding="UTF-8"?> @@ -94,7 +105,8 @@ </datasources> ]]> </programlisting> - <para>Both files should be placed in <emphasis role="bold">server/default/deploy</emphasis> + <para>Both files should be placed in + <emphasis role="bold">server/default/deploy</emphasis> directory of the application server on which you plan to deploy migration application. </para> </sect2> @@ -108,7 +120,8 @@ <itemizedlist> <listitem> <para> - <ulink url="http://www.portletswap.com">PortletSwap</ulink> - the place you can find many + <ulink url="http://www.portletswap.com">PortletSwap</ulink> + - the place you can find many ready portlets </para> </listitem> @@ -143,9 +156,12 @@ </itemizedlist> <para>Using the second method you will always have all latest updates from portal 2.4 cvs branch</para> <para>After downloading the sources you need to build the Migration Application. Before you start be sure - you have <emphasis role="bold">JBOSS_HOME</emphasis> environment variable set pointing + you have + <emphasis role="bold">JBOSS_HOME</emphasis> + environment variable set pointing to JBoss Application Server directory. Migration Application archive can be build using following - commands:</para> + commands: + </para> <programlisting> <![CDATA[ cd jboss-portal-2.4 @@ -157,7 +173,8 @@ ]]> </programlisting> <para>Deployable web application archive can be found at - <emphasis role="bold">jboss-portal-2.4/migration/output/lib/portal-migration.war</emphasis></para> + <emphasis role="bold">jboss-portal-2.4/migration/output/lib/portal-migration.war</emphasis> + </para> <para>You can also deploy it automaticly by executing:</para> <programlisting> <![CDATA[ @@ -176,23 +193,28 @@ </imageobject> </mediaobject> <para>After deploying Migration Application you can access it at - <emphasis role="bold">http://localhost:8080/portal-migration</emphasis>. It is + <emphasis role="bold">http://localhost:8080/portal-migration</emphasis> + . It is password protected so you need to specify: </para> <itemizedlist> <listitem> <para> - <emphasis role="bold">User: </emphasis>admin + <emphasis role="bold">User:</emphasis> + admin </para> </listitem> <listitem> <para> - <emphasis role="bold">Password: </emphasis>simplePassword + <emphasis role="bold">Password:</emphasis> + simplePassword </para> </listitem> </itemizedlist> - <para>Password can be changed in <emphasis role="bold">portal-migration.war/WEB-INF/classes/users.properties</emphasis> - file. Remember to always change the password to less trivial one or undeploy the war file after migration process. + <para>Password can be changed in + <emphasis role="bold">portal-migration.war/WEB-INF/classes/users.properties</emphasis> + file. Remember to always change the password to less trivial one or undeploy the war file after migration + process. Otherwise someone can later have unprotected access to application that can wipe out your database tables... </para> <para>If you logged in successfully you should access this page:</para> @@ -201,14 +223,19 @@ <imagedata align="center" valign="middle" fileref="images/migration/migration_app_3.jpg"/> </imageobject> </mediaobject> - <para>At <emphasis role="bold">Step 2: 2.4 Database Connectivity Check</emphasis> you need to provide datasouce name - that points to JBoss Portal 2.4 database (the destination one)</para> + <para>At + <emphasis role="bold">Step 2: 2.4 Database Connectivity Check</emphasis> + you need to provide datasouce name + that points to JBoss Portal 2.4 database (the destination one) + </para> <mediaobject> <imageobject> <imagedata align="center" valign="middle" fileref="images/migration/migration_app_4.jpg"/> </imageobject> </mediaobject> - <para><emphasis role="bold">Step 3: Create Tables</emphasis></para> + <para> + <emphasis role="bold">Step 3: Create Tables</emphasis> + </para> <mediaobject> <imageobject> <imagedata align="center" valign="middle" fileref="images/migration/migration_app_5.jpg"/> @@ -219,7 +246,8 @@ <itemizedlist> <listitem> <para> - <emphasis role="bold">CMD Data Migration</emphasis> - migrates portal builtin CMS tables content + <emphasis role="bold">CMD Data Migration</emphasis> + - migrates portal builtin CMS tables content </para> <imageobject> <imagedata align="center" valign="middle" fileref="images/migration/migration_app_6.jpg"/> @@ -227,7 +255,8 @@ </listitem> <listitem> <para> - <emphasis role="bold">User/Role Data Migrate</emphasis> - migrates portal user, roles and + <emphasis role="bold">User/Role Data Migrate</emphasis> + - migrates portal user, roles and relations beetween them </para> <imageobject> @@ -236,7 +265,8 @@ </listitem> <listitem> <para> - <emphasis role="bold">Portal Object Data Migrate</emphasis> - migrates + <emphasis role="bold">Portal Object Data Migrate</emphasis> + - migrates whole portal objects structure. This means nodes like portals, pages and windows. </para> <imageobject> @@ -245,7 +275,8 @@ </listitem> <listitem> <para> - <emphasis role="bold">Portal Portlet Instance Data Migrate</emphasis> - migrates + <emphasis role="bold">Portal Portlet Instance Data Migrate</emphasis> + - migrates all portlet instances presented in portal. For each portlet instance its preferences are also persisted. Next all already migrated users are iterated and user preferences related to portlet instance are migrated @@ -256,7 +287,8 @@ </listitem> <listitem> <para> - <emphasis role="bold">Portal Security Data Migrate</emphasis> - migrates security data for portal + <emphasis role="bold">Portal Security Data Migrate</emphasis> + - migrates security data for portal objects and portlet instances. </para> <imageobject> @@ -279,7 +311,8 @@ <imageobject> <imagedata align="center" valign="middle" fileref="images/migration/migration_app_10-fail.jpg"/> </imageobject> - <para>Always check Application Server console output or logs after migration to track possible fail cause.</para> + <para>Always check Application Server console output or logs after migration to track possible fail + cause.</para> </sect2> <sect2 id="migration_final"> <title>Final steps</title> @@ -316,23 +349,30 @@ <sect1 id="descriptors_migration"> <title>Migrating Portlet Descriptors</title> <para>Since 2.2 version of JBoss Portal data from portlet descriptor files are persisted - in database. There is special <emphasis role="boled"><![CDATA[<if-exists/>]]></emphasis> tag + in database. There is special + <emphasis role="boled"><![CDATA[<if-exists/>]]></emphasis> + tag that describes what should portal do when he process descriptor and found data for such portlet application already in database. Therefore after database migration portal will use persisted data. </para> <para>There are some differences beetween 2.2 and 2.4 descriptors. - <emphasis role="bold">portlet-instances.xml</emphasis> file was reintroduced + <emphasis role="bold">portlet-instances.xml</emphasis> + file was reintroduced because of WSRP implementation caused portal architecture changes. Altough to avoid confusion legacy descriptors support was implemented in 2.4 so all 2.2 compiliant portlets - should work out of box.</para> + should work out of box. + </para> <para>Even if your 2.2 portlets deployed successfully in 2.4 you should update their descriptors. Legacy descriptors support will expire in 2.6 and you will need to use new format to achive more complex targets.</para> <sect2 id="car_demo_example"> <title>Car Demo Portlet example</title> - <para>Let's show descriptor changes using <emphasis role="bold">Car Demo</emphasis> + <para>Let's show descriptor changes using + <emphasis role="bold">Car Demo</emphasis> portlet example which is a presentation of JSF portlet. It can be obtained at - <ulink url="http://www.portletswap.com">PortletSwap</ulink>. In 2.2 prepared version it has such descriptor:</para> + <ulink url="http://www.portletswap.com">PortletSwap</ulink> + . In 2.2 prepared version it has such descriptor: + </para> <itemizedlist> <listitem> <para> @@ -368,7 +408,8 @@ </listitem> </itemizedlist> <para>Note that as we said before you can successfully deploy it on JBoss Portal 2.4. But because - such descriptor format is 2.2 specific you will end with a warning on JBoss Application Server console output:</para> + such descriptor format is 2.2 specific you will end with a warning on JBoss Application Server console + output:</para> <programlisting> <![CDATA[ INFO [PortletAppDeployment] These instances have been found in -object.xml, you should put them in the file @@ -391,21 +432,42 @@ <para>To have descriptors in our example portlet 2.4 valid you need to follow few simple steps:</para> <itemizedlist> <listitem> - <para>In <emphasis role="bold">cardemo-object.xml</emphasis> file comment out whole - <emphasis role="bold"><![CDATA[<deployment>...</deployment>]]></emphasis> tag which contains - <emphasis role="bold"><![CDATA[<instance>...</instance>]]></emphasis>.</para> + <para>In + <emphasis role="bold">cardemo-object.xml</emphasis> + file comment out whole + <emphasis role="bold"><![CDATA[<deployment>...</deployment>]]></emphasis> + tag which contains + <emphasis role="bold"><![CDATA[<instance>...</instance>]]></emphasis> + . + </para> </listitem> <listitem> <para>Copy the text you just commented out and put it in newly created - <emphasis role="bold">portlet-instances.xml</emphasis> file.</para> + <emphasis role="bold">portlet-instances.xml</emphasis> + file. + </para> </listitem> <listitem> - <para>Edit and change <emphasis role="bold">portlet-instances.xml</emphasis> file using following rules:</para> - <para>Surround whole file content with <emphasis role="bold"><![CDATA[</deployments>]]></emphasis> tag.</para> - <para>Replace <emphasis role="bold"><![CDATA[</instance-name>]]></emphasis> tag with - <emphasis role="bold"><![CDATA[</instance-id>]]></emphasis> one</para> - <para>Replace <emphasis role="bold"><![CDATA[</component-ref>]]></emphasis> tag with - <emphasis role="bold"><![CDATA[</portlet-ref>]]></emphasis> one</para> + <para>Edit and change + <emphasis role="bold">portlet-instances.xml</emphasis> + file using following rules: + </para> + <para>Surround whole file content with + <emphasis role="bold"><![CDATA[</deployments>]]></emphasis> + tag. + </para> + <para>Replace + <emphasis role="bold"><![CDATA[</instance-name>]]></emphasis> + tag with + <emphasis role="bold"><![CDATA[</instance-id>]]></emphasis> + one + </para> + <para>Replace + <emphasis role="bold"><![CDATA[</component-ref>]]></emphasis> + tag with + <emphasis role="bold"><![CDATA[</portlet-ref>]]></emphasis> + one + </para> </listitem> </itemizedlist> <para>So after updates your portlet descriptors should look like this:</para> |
From: Roy R. <ru...@jb...> - 2006-07-06 20:38:23
|
User: russo Date: 06/07/06 16:38:17 Modified: referenceGuide/en/modules clustering.xml installation.xml Log: update for clustering dist Revision Changes Path 1.7 +1 -3 jboss-portal-docs/referenceGuide/en/modules/clustering.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: clustering.xml =================================================================== RCS file: /cvsroot/jboss/jboss-portal-docs/referenceGuide/en/modules/clustering.xml,v retrieving revision 1.6 retrieving revision 1.7 diff -u -b -r1.6 -r1.7 --- clustering.xml 3 Jul 2006 23:45:27 -0000 1.6 +++ clustering.xml 6 Jul 2006 20:38:17 -0000 1.7 @@ -14,8 +14,6 @@ </chapterinfo> <title>Clustering Configuration</title> <para>This section covers configuring JBoss Portal to function in a clustered environment.</para> - <warning>As of JBoss Portal 2.2.1RC2, the CMS feature is not reliably clustered. Look for future versions for full - clustering capabilities in the CMS.</warning> <sect1> <title>Introduction</title> <para>JBoss Portal leverages various clustered services that are found in JBoss Application Server. This section @@ -162,7 +160,7 @@ </portlet-app> ]]></programlisting> <caption> - <para>Configures YourPortlet to be replicated in jboss-portlet.xml</para> + <para>Configure YourPortlet to be replicated in jboss-portlet.xml</para> </caption> </para> </sect2> 1.5 +5 -0 jboss-portal-docs/referenceGuide/en/modules/installation.xml (In the diff below, changes in quantity of whitespace are not shown.) Index: installation.xml =================================================================== RCS file: /cvsroot/jboss/jboss-portal-docs/referenceGuide/en/modules/installation.xml,v retrieving revision 1.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- installation.xml 30 Jun 2006 21:12:55 -0000 1.4 +++ installation.xml 6 Jul 2006 20:38:17 -0000 1.5 @@ -21,6 +21,11 @@ <xref linkend="install_source"/> </listitem> </itemizedlist> + <note>As of JBoss Portal 2.4-CR1, we have made available pre-configured clustered versions. They are available + from the + <ulink url="http://labs.jboss.com/portal/jbossportal/download/index.html">download page</ulink> + , in the same 3 flavors as the non-clustered version. The installation difference, being that they must be deployed in the <emphasis>all</emphasis> configuration in JBoss AS. Read <xref linkend="clustering"/> for more details on how to enable clustering from source. + </note> </para> <sect1 id="install_bundle"> <title>Installing from Bundled Download</title> |
From: Roy R. <ru...@jb...> - 2006-07-06 20:20:40
|
User: russo Date: 06/07/06 16:20:38 Modified: readmeFiles jboss-portal-ha-bin.README jboss-portal-bin.README jboss-portal-src.README Log: update readmes Revision Changes Path 1.2 +1 -1 jboss-portal-docs/readmeFiles/jboss-portal-ha-bin.README (In the diff below, changes in quantity of whitespace are not shown.) Index: jboss-portal-ha-bin.README =================================================================== RCS file: /cvsroot/jboss/jboss-portal-docs/readmeFiles/jboss-portal-ha-bin.README,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- jboss-portal-ha-bin.README 5 Jul 2006 16:22:31 -0000 1.1 +++ jboss-portal-ha-bin.README 6 Jul 2006 20:20:38 -0000 1.2 @@ -11,7 +11,7 @@ INSTALLATION: - For installation, please refer to the user guide available in the 'docs' directory + For installation, please refer to the reference guide available in the 'docs' directory Make sure you deploy your portal under the 'all' configuration of the JBoss Application Server and use a shared DB. 1.8 +1 -1 jboss-portal-docs/readmeFiles/jboss-portal-bin.README (In the diff below, changes in quantity of whitespace are not shown.) Index: jboss-portal-bin.README =================================================================== RCS file: /cvsroot/jboss/jboss-portal-docs/readmeFiles/jboss-portal-bin.README,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- jboss-portal-bin.README 9 May 2006 05:26:23 -0000 1.7 +++ jboss-portal-bin.README 6 Jul 2006 20:20:38 -0000 1.8 @@ -11,7 +11,7 @@ INSTALLATION: - For installation, please refer to the user guide available in the 'docs' directory + For installation, please refer to the reference guide available in the 'docs' directory RUNNING: To run the application, start JBoss AS and point your web browser to: 1.8 +1 -1 jboss-portal-docs/readmeFiles/jboss-portal-src.README (In the diff below, changes in quantity of whitespace are not shown.) Index: jboss-portal-src.README =================================================================== RCS file: /cvsroot/jboss/jboss-portal-docs/readmeFiles/jboss-portal-src.README,v retrieving revision 1.7 retrieving revision 1.8 diff -u -b -r1.7 -r1.8 --- jboss-portal-src.README 9 May 2006 05:26:23 -0000 1.7 +++ jboss-portal-src.README 6 Jul 2006 20:20:38 -0000 1.8 @@ -11,7 +11,7 @@ INSTALLATION: - For installation, please refer to the user guide available in the 'docs' directory + For installation, please refer to the reference guide available in the 'docs' directory RUNNING: To run the application, start JBoss AS and point your web browser to: |
From: Gurkan E. <gur...@ya...> - 2006-07-06 19:49:01
|
User: gurkanerdogdu Date: 06/07/06 15:48:56 Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards NewCacheProjectWizard.java RemoteConfigurationWizard.java NewCacheConfigurationWizard.java Log: Unnecessary imports and content assist in editor Revision Changes Path 1.3 +0 -13 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheProjectWizard.java (In the diff below, changes in quantity of whitespace are not shown.) Index: NewCacheProjectWizard.java =================================================================== RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/NewCacheProjectWizard.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- NewCacheProjectWizard.java 6 Jul 2006 17:17:01 -0000 1.2 +++ NewCacheProjectWizard.java 6 Jul 2006 19:48:56 -0000 1.3 @@ -6,8 +6,6 @@ */ package org.jboss.ide.eclipse.jbosscache.wizards; -import java.awt.Dialog; -import java.io.ByteArrayOutputStream; import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; @@ -40,25 +38,14 @@ import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; import org.eclipse.swt.SWT; -import org.eclipse.swt.events.SelectionAdapter; -import org.eclipse.swt.events.SelectionEvent; -import org.eclipse.swt.events.SelectionListener; -import org.eclipse.swt.layout.GridData; -import org.eclipse.swt.layout.GridLayout; -import org.eclipse.swt.widgets.Button; import org.eclipse.swt.widgets.Composite; import org.eclipse.swt.widgets.Display; -import org.eclipse.swt.widgets.Group; import org.eclipse.ui.INewWizard; import org.eclipse.ui.IPerspectiveDescriptor; -import org.eclipse.ui.IPerspectiveFactory; import org.eclipse.ui.IPerspectiveRegistry; import org.eclipse.ui.IWorkbench; import org.eclipse.ui.PlatformUI; import org.eclipse.ui.dialogs.WizardNewProjectCreationPage; -import org.eclipse.ui.internal.PerspectiveHelper; -import org.eclipse.ui.internal.registry.PerspectiveRegistry; -import org.jboss.ide.eclipse.jbosscache.ICacheConstants; import org.jboss.ide.eclipse.jbosscache.JBossCachePlugin; import org.jboss.ide.eclipse.jbosscache.classpath.CacheVersion124CpContainer; import org.jboss.ide.eclipse.jbosscache.classpath.CacheVersion130CpContainer; 1.2 +0 -5 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/RemoteConfigurationWizard.java (In the diff below, changes in quantity of whitespace are not shown.) Index: RemoteConfigurationWizard.java =================================================================== RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/wizards/RemoteConfigurationWizard.java,v retrieving revision 1.1 retrieving revision 1.2 diff -u -b -r1.1 -r1.2 --- RemoteConfigurationWizard.java 23 Mar 2006 11:12:31 -0000 1.1 +++ RemoteConfigurationWizard.java 6 Jul 2006 19:48:56 -0000 1.2 @@ -6,14 +6,9 @@ */ package org.jboss.ide.eclipse.jbosscache.wizards; -import java.io.File; -import java.lang.reflect.InvocationTargetException; - -import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; import org.eclipse.jface.dialogs.MessageDialog; -import org.eclipse.jface.operation.IRunnableWithProgress; import org.eclipse.jface.viewers.IStructuredSelection; import org.eclipse.jface.wizard.Wizard; import org.eclipse.ui.INewWizard; 1.5 +0 -6 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.4 retrieving revision 1.5 diff -u -b -r1.4 -r1.5 --- NewCacheConfigurationWizard.java 6 Jul 2006 17:17:01 -0000 1.4 +++ NewCacheConfigurationWizard.java 6 Jul 2006 19:48:56 -0000 1.5 @@ -10,11 +10,7 @@ import java.io.File; import java.io.FileInputStream; import java.io.FileOutputStream; -import java.io.FileReader; -import java.io.PrintWriter; -import java.io.StringReader; import java.lang.reflect.InvocationTargetException; -import java.util.List; import org.eclipse.core.runtime.IProgressMonitor; import org.eclipse.core.runtime.IStatus; @@ -38,10 +34,8 @@ import org.jboss.ide.eclipse.jbosscache.internal.CacheMessages; import org.jboss.ide.eclipse.jbosscache.model.cache.ICacheRootInstance; import org.jboss.ide.eclipse.jbosscache.model.config.CacheConfigurationModel; -import org.jboss.ide.eclipse.jbosscache.model.config.CacheConfigurationModel.CacheLoaderConfigInternal; import org.jboss.ide.eclipse.jbosscache.model.factory.CacheInstanceFactory; import org.jboss.ide.eclipse.jbosscache.utils.CacheUtil; -import org.jboss.ide.eclipse.jbosscache.wizards.pages.CacheLoaderConfigurationPage; import org.jboss.ide.eclipse.jbosscache.wizards.pages.StandardConfigurationPage; /** |
From: Gurkan E. <gur...@ya...> - 2006-07-06 19:49:01
|
User: gurkanerdogdu Date: 06/07/06 15:48:56 Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/views/content TableContentProvider.java Log: Unnecessary imports and content assist in editor Revision Changes Path 1.4 +0 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/views/content/TableContentProvider.java (In the diff below, changes in quantity of whitespace are not shown.) Index: TableContentProvider.java =================================================================== RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/views/content/TableContentProvider.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- TableContentProvider.java 23 Mar 2006 11:12:31 -0000 1.3 +++ TableContentProvider.java 6 Jul 2006 19:48:56 -0000 1.4 @@ -19,7 +19,6 @@ import org.eclipse.jface.viewers.Viewer; import org.jboss.cache.aop.AOPInstance; import org.jboss.cache.aop.InternalDelegate; -import org.jboss.cache.aop.TreeCacheAop; import org.jboss.ide.eclipse.jbosscache.ICacheConstants; import org.jboss.ide.eclipse.jbosscache.JBossCachePlugin; import org.jboss.ide.eclipse.jbosscache.model.cache.ICacheInstance; |
From: Gurkan E. <gur...@ya...> - 2006-07-06 19:49:01
|
User: gurkanerdogdu Date: 06/07/06 15:48:56 Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/views/config TreeCacheViewNodeListener.java TreeCacheViewLabelProvider.java Log: Unnecessary imports and content assist in editor Revision Changes Path 1.4 +0 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/views/config/TreeCacheViewNodeListener.java (In the diff below, changes in quantity of whitespace are not shown.) Index: TreeCacheViewNodeListener.java =================================================================== RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/views/config/TreeCacheViewNodeListener.java,v retrieving revision 1.3 retrieving revision 1.4 diff -u -b -r1.3 -r1.4 --- TreeCacheViewNodeListener.java 23 Mar 2006 11:12:30 -0000 1.3 +++ TreeCacheViewNodeListener.java 6 Jul 2006 19:48:56 -0000 1.4 @@ -12,7 +12,6 @@ import org.eclipse.core.runtime.IStatus; import org.eclipse.core.runtime.Status; -import org.eclipse.swt.custom.BusyIndicator; import org.jboss.cache.Fqn; import org.jboss.cache.TreeCache; import org.jboss.ide.eclipse.jbosscache.ICacheConstants; 1.3 +0 -3 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/views/config/TreeCacheViewLabelProvider.java (In the diff below, changes in quantity of whitespace are not shown.) Index: TreeCacheViewLabelProvider.java =================================================================== RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/views/config/TreeCacheViewLabelProvider.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- TreeCacheViewLabelProvider.java 23 Mar 2006 11:12:30 -0000 1.2 +++ TreeCacheViewLabelProvider.java 6 Jul 2006 19:48:56 -0000 1.3 @@ -6,12 +6,9 @@ */ package org.jboss.ide.eclipse.jbosscache.views.config; -import org.eclipse.jface.resource.ImageDescriptor; import org.eclipse.jface.viewers.ILabelProvider; import org.eclipse.jface.viewers.ILabelProviderListener; import org.eclipse.swt.graphics.Image; -import org.eclipse.ui.ISharedImages; -import org.eclipse.ui.PlatformUI; import org.jboss.ide.eclipse.jbosscache.ICacheConstants; import org.jboss.ide.eclipse.jbosscache.JBossCachePlugin; import org.jboss.ide.eclipse.jbosscache.model.cache.ICacheInstance; |
From: Gurkan E. <gur...@ya...> - 2006-07-06 19:49:01
|
User: gurkanerdogdu Date: 06/07/06 15:48:57 Modified: cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/cache AbstractCacheInstance.java AbstractCacheRootInstance.java Log: Unnecessary imports and content assist in editor Revision Changes Path 1.3 +0 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/cache/AbstractCacheInstance.java (In the diff below, changes in quantity of whitespace are not shown.) Index: AbstractCacheInstance.java =================================================================== RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/cache/AbstractCacheInstance.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- AbstractCacheInstance.java 23 Mar 2006 11:12:32 -0000 1.2 +++ AbstractCacheInstance.java 6 Jul 2006 19:48:57 -0000 1.3 @@ -12,7 +12,6 @@ import java.util.List; import java.util.Map; -import org.eclipse.ui.PlatformUI; import org.jboss.ide.eclipse.jbosscache.JBossCachePlugin; /** 1.3 +0 -1 jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/cache/AbstractCacheRootInstance.java (In the diff below, changes in quantity of whitespace are not shown.) Index: AbstractCacheRootInstance.java =================================================================== RCS file: /cvsroot/jboss/jbosside/cache/plugins/org.jboss.ide.eclipse.jbosscache/src/org/jboss/ide/eclipse/jbosscache/model/cache/AbstractCacheRootInstance.java,v retrieving revision 1.2 retrieving revision 1.3 diff -u -b -r1.2 -r1.3 --- AbstractCacheRootInstance.java 23 Mar 2006 11:12:32 -0000 1.2 +++ AbstractCacheRootInstance.java 6 Jul 2006 19:48:57 -0000 1.3 @@ -6,7 +6,6 @@ */ package org.jboss.ide.eclipse.jbosscache.model.cache; -import java.io.File; import java.util.ArrayList; import java.util.Iterator; import java.util.List; |