jboss-svn-commits Mailing List for JBoss Community (Page 20)

Brought to you by: newtonm, nihility, patriot1burke, starksm

jboss-svn-commits — JBoss SVN commit notifications

You can subscribe to this list here.

2005	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (233)	Sep (199)	Oct (206)	Nov (185)	Dec (270)
2006	Jan (232)	Feb (426)	Mar (623)	Apr (592)	May (506)	Jun (389)	Jul (160)	Aug (3)	Sep (1)	Oct (1)	Nov (2)	Dec (5)
2007	Jan (1)	Feb (1)	Mar (2)	Apr (2)	May (4)	Jun (2)	Jul	Aug (3)	Sep (5)	Oct (9)	Nov (6)	Dec (6)
2008	Jan (3)	Feb	Mar (1)	Apr (3)	May (3)	Jun (5)	Jul (10)	Aug (2)	Sep (12)	Oct (10)	Nov (54)	Dec (49)
2009	Jan (19)	Feb (13)	Mar (20)	Apr (24)	May (44)	Jun (29)	Jul (32)	Aug (10)	Sep (7)	Oct (10)	Nov (4)	Dec (17)
2010	Jan (14)	Feb (5)	Mar (23)	Apr (50)	May (31)	Jun (9)	Jul (5)	Aug (4)	Sep (7)	Oct (5)	Nov (2)	Dec (3)
2011	Jan (12)	Feb (5)	Mar (5)	Apr (3)	May (4)	Jun (3)	Jul (2)	Aug	Sep	Oct	Nov (1)	Dec
2012	Jan (1)	Feb (2)	Mar	Apr (1)	May (1)	Jun (2)	Jul (4)	Aug (1)	Sep	Oct (1)	Nov	Dec
2013	Jan	Feb	Mar	Apr	May	Jun	Jul (2)	Aug (1)	Sep	Oct	Nov	Dec
2014	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug (3)	Sep	Oct	Nov	Dec (1)
2015	Jan	Feb	Mar (2)	Apr	May	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec
2016	Jan	Feb	Mar	Apr	May	Jun (1)	Jul (1)	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 18 19 20 21 22 .. 165 > >> (Page 20 of 165)

[Jboss-svn-commits] JBL Code SVN: r4772 - labs/jbossrules/trunk/documentation/training/developers-course

From: <jbo...@li...> - 2006-06-15 23:51:56

Author: mic...@jb...
Date: 2006-06-15 19:51:50 -0400 (Thu, 15 Jun 2006)
New Revision: 4772

Modified:
   labs/jbossrules/trunk/documentation/training/developers-course/Module 3 - Rule Engine Concepts 1.odp
Log:
more updates

Modified: labs/jbossrules/trunk/documentation/training/developers-course/Module 3 - Rule Engine Concepts 1.odp
===================================================================
(Binary files differ)

[Jboss-svn-commits] JBL Code SVN: r4771 - labs/jbossweb/trunk/src/share/native/build

From: <jbo...@li...> - 2006-06-15 17:25:49

Author: jfr...@jb...
Date: 2006-06-15 13:25:41 -0400 (Thu, 15 Jun 2006)
New Revision: 4771

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Remove flags that destroyed freetype (double computation were completly wrong!).


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-15 16:08:04 UTC (rev 4770)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-15 17:25:41 UTC (rev 4771)
@@ -159,7 +159,7 @@
  if [ ${CC} = "cc" ]
  then
    # Sun Studio
-   CC=cc CPPFLAGS="$CPPFLAGS -I/opt/SUNWspro/prod/include/CC/Cstd/rw -I/opt/SUNWspro/prod/include/CC/Cstd -DHUGE_VAL=__builtin_huge_val" ./configure --prefix=${INSDIR} ${ADDCON}
+   CC=cc CPPFLAGS="$CPPFLAGS" ./configure --prefix=${INSDIR} ${ADDCON}
  else
    ./configure --prefix=${INSDIR} ${ADDCON}
  fi
@@ -510,7 +510,7 @@
   (cd openssl-${OSSLVER}
    if [ ${CC} = "cc" ]
    then
-     ./Configure --prefix=${TOOLS}/SSL threads no-zlib no-zlib-dynamic no-gmp no-krb5 no-rc5 no-mdc2 no-idea no-ec shared $COMPILER -I/opt/SUNWspro/prod/include/CC/Cstd/rw -I/opt/SUNWspro/prod/include/CC/Cstd
+     ./Configure --prefix=${TOOLS}/SSL threads no-zlib no-zlib-dynamic no-gmp no-krb5 no-rc5 no-mdc2 no-idea no-ec shared $COMPILER
    else
      ./config --prefix=${TOOLS}/SSL threads no-zlib no-zlib-dynamic no-gmp no-krb5 no-rc5 no-mdc2 no-idea no-ec shared
    fi
@@ -637,8 +637,8 @@
    # Sun Studio
    CC=cc
    export CC
-   CPPFLAGS="-I/opt/SUNWspro/prod/include/CC/Cstd/rw -I/opt/SUNWspro/prod/include/CC/Cstd -DHUGE_VAL=__builtin_huge_val"
-   export CPPFLAGS
+   #CPPFLAGS="-I/opt/SUNWspro/prod/include/CC/Cstd/rw -I/opt/SUNWspro/prod/include/CC/Cstd -DHUGE_VAL=__builtin_huge_val"
+   #export CPPFLAGS
 fi
 (cd php-${PHPVER}
  ./configure --prefix=$TOOLS/PHP \

[Jboss-svn-commits] JBL Code SVN: r4770 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: . plugins service/impl tools

From: <jbo...@li...> - 2006-06-15 16:08:25

Author: wrzep
Date: 2006-06-15 12:08:04 -0400 (Thu, 15 Jun 2006)
New Revision: 4770

Removed:
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java
Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
Log:
JBLAB-599
Merged async and sync ScoresManager.
Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2006-06-15 15:31:16 UTC (rev 4769)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2006-06-15 16:08:04 UTC (rev 4770)
@@ -48,7 +48,6 @@
 import org.jboss.forge.status.templates.Column;
 import org.jboss.forge.status.templates.Columns;
 import org.jboss.forge.status.templates.MatrixTemplate;
-import org.jboss.forge.status.tools.ScoresManagerSync;
 import org.jboss.forge.status.tools.ScoresManager;
 
 import org.jboss.logging.Logger;
@@ -94,7 +93,7 @@
 		pluginsConf = getPluginsConfList(pluginsRoot);
 		ServiceConf serviceConf = new ServiceConfImpl(serviceNode);
 	
-		ScoresManagerSync.init(portalName, serviceConf);
+		ScoresManager.init(portalName, serviceConf);
 		
 		PluginsValues pluginsValues;
 		

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java	2006-06-15 15:31:16 UTC (rev 4769)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java	2006-06-15 16:08:04 UTC (rev 4770)
@@ -27,7 +27,7 @@
 import java.io.IOException;
 
 import org.jboss.forge.status.common.Locations;
-import org.jboss.forge.status.exceptions.ScoresException;
+import org.jboss.forge.status.exceptions.GetScoresException;
 import org.jboss.portal.common.context.DelegateContext;
 
 import org.jboss.shotoku.ContentManager;
@@ -83,7 +83,7 @@
 			
 			fillContext();
 			
-		} catch (ScoresException e){
+		} catch (GetScoresException e){
 			// do nothing
 		} catch (Exception e) {
 			e.printStackTrace();

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java	2006-06-15 15:31:16 UTC (rev 4769)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java	2006-06-15 16:08:04 UTC (rev 4770)
@@ -29,7 +29,7 @@
 import org.jboss.forge.status.exceptions.InvalidPluginPropertiesException;
 import org.jboss.forge.status.exceptions.GetScoresException;
 import org.jboss.forge.status.tools.Plugins;
-import org.jboss.forge.status.tools.ScoresManagerSync;
+import org.jboss.forge.status.tools.ScoresManager;
 
 /**
 * @author Pawel Wrzeszcz (paw...@gm...)
@@ -79,7 +79,7 @@
 	
 		
 		try {
-			prevValue = ScoresManagerSync.getValue(
+			prevValue = ScoresManager.getValue(
 					insidePlugin.getId(), projectId, cal, now);
 		} catch (GetScoresException e) {
 			return 0;

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java	2006-06-15 15:31:16 UTC (rev 4769)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java	2006-06-15 16:08:04 UTC (rev 4770)
@@ -38,7 +38,7 @@
 import org.jboss.forge.status.service.protocol.PluginConf;
 import org.jboss.forge.status.service.protocol.SaveRequest;
 
-import org.jboss.forge.status.tools.ScoresManagerSync;
+import org.jboss.forge.status.tools.ScoresManager;
 import org.jboss.logging.Logger;
 
 
@@ -88,7 +88,7 @@
 		List<PluginConf> pluginsConf = saveRequest.getPluginsConf();
 		
 		try {
-			ScoresManagerSync.save(projects, pluginsConf);
+			ScoresManager.saveSync(projects, pluginsConf);
 		} catch (ScoresSaveException e) {
 			log.warn("Error processing save request.", e);
 		}		

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java	2006-06-15 15:31:16 UTC (rev 4769)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java	2006-06-15 16:08:04 UTC (rev 4770)
@@ -37,10 +37,14 @@
 import javax.naming.Context;
 import javax.naming.InitialContext;
 import javax.naming.NamingException;
+import javax.rmi.PortableRemoteObject;
 
 import org.jboss.forge.common.projects.Projects;
 import org.jboss.forge.status.exceptions.GetScoresException;
 import org.jboss.forge.status.exceptions.ScoresSaveException;
+import org.jboss.forge.status.service.ScoresService;
+import org.jboss.forge.status.service.ScoresServiceLocal;
+import org.jboss.forge.status.service.ScoresServiceRemote;
 import org.jboss.forge.status.service.impl.protocol.SaveRequestImpl;
 import org.jboss.forge.status.service.protocol.PluginConf;
 import org.jboss.forge.status.service.protocol.PluginsValues;
@@ -54,15 +58,16 @@
 
 public class ScoresManager {
 	
+	private static String portalName;
 	private static Properties properties;
-	private static boolean remote;
+	private static boolean isRemote;
 	
 	public static void init(String portalName, ServiceConf serviceConf) {
 		
-		ScoresManagerSync.init(portalName, serviceConf);
+		ScoresManager.portalName = portalName;
 		
 		properties = serviceConf.getProperties();
-		remote = serviceConf.isRemote();
+		isRemote = serviceConf.isRemote();
 	}
 
 	public static void save(Projects projects, List<PluginConf> pluginsConf)
@@ -78,6 +83,53 @@
 		}
 	}
 	
+	public static void saveSync(Projects projects,
+										List<PluginConf> pluginsConf)
+										throws ScoresSaveException {
+
+		ScoresService service = null;
+
+		try {
+			service = getService();
+		} catch (NamingException e) {
+			throw new ScoresSaveException(e);
+		}
+
+		service.save(projects, pluginsConf, portalName);
+}
+	public static boolean hasScores(Calendar cal) {
+		
+		ScoresService service;
+		try {
+			service = getService();
+		} catch (NamingException e) {
+			return false;
+		}
+		
+		return service.hasPluginsValues(portalName, cal);
+	}
+	
+	
+	public static PluginsValues getScores(Calendar cal)
+										throws GetScoresException {
+
+		PluginsValues pluginsValues = null;
+
+		try {
+			ScoresService service = getService(); 
+			pluginsValues = service.getPluginsValues(portalName, cal);
+		} catch (Exception e) {
+			throw new GetScoresException(e);
+		}
+
+		if (pluginsValues == null) {
+			throw new GetScoresException();
+		}
+
+		return pluginsValues;
+	}
+	
+	
 	public static PluginsValues getLatestScores()
 									throws GetScoresException {
 		
@@ -88,8 +140,8 @@
 			
 			System.out.println("Trying " + cal.getTime().toString());
 			
-			if (ScoresManagerSync.hasScores(cal)) {
-				return ScoresManagerSync.getScores(cal);
+			if (ScoresManager.hasScores(cal)) {
+				return ScoresManager.getScores(cal);
 			}
 			
 			if ((++attempts) == Constants.MAX_ATTEMPTS) {
@@ -102,36 +154,101 @@
 		}
 	}
 
+
+	/**
+	 * For the specified plugin returns historical project score
+	 * from the given <code>date</code> in the past.
+	 * 
+	 * Notice that only year, month and day matter in passed dates.
+	 * 
+	 * @return project score from the given date for specified plugin
+	 * @throws GetScoresException
+	 */
+	public static long getValue(String pluginId, String projectId,
+											Calendar cal)
+			throws GetScoresException {
+		
+		PluginsValues pluginsValues = getScores(cal);
+	    
+		return pluginsValues.getPluginValue(pluginId, projectId);
+	}
+
+	public static long getValue(String id, String projectId,
+			Calendar start, Calendar end) throws GetScoresException {
+		
+		long value;
+		Calendar cal = start;
+		
+		for (;;) {
+			
+			if (cal.after(end)) {
+				throw new GetScoresException();
+			}
+			
+			try {
+				value = getValue(id, projectId, cal);
+				return value;
+			} catch (GetScoresException e) {
+				// try next
+				cal.add(Calendar.DAY_OF_MONTH, 1);
+			}	
+		}
+	}
 	
+	private static ScoresService getService() throws NamingException {
+		
+		Context context = null;
+		if (isRemote) {
+			context = new InitialContext(properties);
+		} else {
+			context = new InitialContext();
+		}
+			
+		//	Perform look up using JNDI name of ejb object
+		String serviceBinding =
+			(isRemote ? Constants.STATUS_REMOTE_SERVICE :
+						Constants.STATUS_LOCAL_SERVICE);
+		Object ref = context.lookup(serviceBinding);
+			
+		// Narrow the reference of the object returned by lookup() method
+		ScoresService service = 
+			(ScoresService) PortableRemoteObject.narrow( ref, 
+									(isRemote ? ScoresServiceRemote.class :
+												ScoresServiceLocal.class));
+		
+		return service;
+	}
+
 	private static void sendMessage(String name, Serializable request) throws
-							NamingException, JMSException {
-		
+												NamingException, JMSException {
+
 		Queue queue = null;
 		QueueConnection connection = null;
 		QueueSession session = null;
 		QueueSender sender = null;
-		
+
 		Context context = null;
-		if (remote) {
+		if (isRemote) {
 			context = new InitialContext(properties);
 		} else {
 			context = new InitialContext();
 		}
-		
-	    queue = (Queue) context.lookup(Constants.QUEUE_NAME);
-	    QueueConnectionFactory factory =
-	        (QueueConnectionFactory) context.lookup("java:/ConnectionFactory");
-	    connection = factory.createQueueConnection();
-	    session = connection.createQueueSession(false,
-	            QueueSession.AUTO_ACKNOWLEDGE);
-	
-	    // Create message
+
+		queue = (Queue) context.lookup(Constants.QUEUE_NAME);
+		QueueConnectionFactory factory =
+			(QueueConnectionFactory) context.lookup("java:/ConnectionFactory");
+		connection = factory.createQueueConnection();
+		session = connection.createQueueSession(false,
+												QueueSession.AUTO_ACKNOWLEDGE);
+
+		// Create a message
 		ObjectMessage message = session.createObjectMessage();
-	    message.setStringProperty("name", name);
-	    message.setObject(request);
-	    
+		message.setStringProperty("name", name);
+		message.setObject(request);
+
 		sender = session.createSender(queue);
-	    sender.send(message);
-	    session.close ();
+		sender.send(message);
+		session.close ();
 	}
+	
 }

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java	2006-06-15 15:31:16 UTC (rev 4769)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java	2006-06-15 16:08:04 UTC (rev 4770)
@@ -1,182 +0,0 @@
-/*
- * 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.forge.status.tools;
-
-import java.util.Calendar;
-import java.util.List;
-import java.util.Properties;
-
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import javax.naming.NamingException;
-import javax.rmi.PortableRemoteObject;
-
-import org.jboss.forge.common.projects.Projects;
-import org.jboss.forge.status.common.Constants;
-import org.jboss.forge.status.exceptions.GetScoresException;
-import org.jboss.forge.status.exceptions.ScoresSaveException;
-import org.jboss.forge.status.service.ScoresService;
-import org.jboss.forge.status.service.ScoresServiceLocal;
-import org.jboss.forge.status.service.ScoresServiceRemote;
-import org.jboss.forge.status.service.protocol.PluginConf;
-import org.jboss.forge.status.service.protocol.PluginsValues;
-import org.jboss.forge.status.service.protocol.ServiceConf;
-
-/**
-* @author Pawel Wrzeszcz (pawel.wrzeszcz [at] gmail.com)
-*/
-
-public class ScoresManagerSync {
-	
-	private static String portalName;
-	private static boolean isRemote; 
-	private static Properties properties;
-	
-	public static void init(String portalName, ServiceConf serviceConf) {
-		
-		ScoresManagerSync.portalName = portalName;
-		
-		isRemote = serviceConf.isRemote();
-		
-		properties = serviceConf.getProperties();
-	}
-
-	public static void save(Projects projects, List<PluginConf> pluginsConf)
-											throws ScoresSaveException {
-		
-		ScoresService service = null;
-		
-		try {
-			service = getService();
-		} catch (NamingException e) {
-			throw new ScoresSaveException(e);
-		}
-
-		service.save(projects, pluginsConf, portalName);
-	}
-
-	public static PluginsValues getScores(Calendar cal)
-										throws GetScoresException {
-			
-		PluginsValues pluginsValues = null;
-		
-		try {
-			ScoresService service = getService(); 
-	        pluginsValues = service.getPluginsValues(portalName, cal);
-	    } catch (Exception e) {
-	        throw new GetScoresException(e);
-	    }
-			
-	    if (pluginsValues == null) {
-	        throw new GetScoresException();
-	    }
-		
-	    return pluginsValues;
-	}
-	
-	public static boolean hasScores(Calendar cal) {
-		
-		ScoresService service;
-		try {
-			service = getService();
-		} catch (NamingException e) {
-			return false;
-		}
-		
-		return service.hasPluginsValues(portalName, cal);
-	}
-	
-	/**
-	 * For the specified plugin returns historical project score
-	 * from the given <code>date</code> in the past.
-	 * 
-	 * Notice that only year, month and day matter in passed dates.
-	 * 
-	 * @return project score from the given date for specified plugin
-	 * @throws GetScoresException
-	 */
-	public static long getValue(String pluginId, String projectId,
-											Calendar cal)
-			throws GetScoresException {
-		
-		PluginsValues pluginsValues = getScores(cal);
-	    
-		return pluginsValues.getPluginValue(pluginId, projectId);
-	}
-
-	public static PluginsValues getCurrentScores()
-									throws GetScoresException {
-		
-		Calendar now = Calendar.getInstance();
-		
-		return getScores(now);
-	}
-	
-	private static ScoresService getService() throws NamingException {
-		
-		Context context = new InitialContext(properties);
-			
-		//	Perform look up using JNDI name of ejb object
-		String serviceBinding =
-			(isRemote ? Constants.STATUS_REMOTE_SERVICE :
-						Constants.STATUS_LOCAL_SERVICE);
-		Object ref = context.lookup(serviceBinding);
-			
-		// Narrow the reference of the object returned by lookup() method
-		ScoresService service = 
-			(ScoresService) PortableRemoteObject.narrow( ref, 
-									(isRemote ? ScoresServiceRemote.class :
-												ScoresServiceLocal.class));
-		
-		return service;
-	}
-
-	public static long getValue(String id, String projectId,
-			Calendar start, Calendar end) throws GetScoresException {
-		
-		long value;
-		Calendar cal = start;
-		
-		for (;;) {
-			
-			if (cal.after(end)) {
-				throw new GetScoresException();
-			}
-			
-			try {
-				value = getValue(id, projectId, cal);
-				return value;
-			} catch (GetScoresException e) {
-				// try next
-				cal.add(Calendar.DAY_OF_MONTH, 1);
-			}	
-		}
-	}
-	
-	/*
-	 * java.naming.factory.initial=org.jnp.interfaces.NamingContextFactory
-	 * java.naming.factory.url.pkgs=org.jboss.naming:org.jnp.interfaces
-	 * java.naming.provider.url=localhost:1099  
-	 * jnp.disableDiscovery=true
-	 */
-}

[Jboss-svn-commits] JBL Code SVN: r4769 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: . common tools

From: <jbo...@li...> - 2006-06-15 15:31:44

Author: wrzep
Date: 2006-06-15 11:31:16 -0400 (Thu, 15 Jun 2006)
New Revision: 4769

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
Log:
JBLAB-599
Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2006-06-15 13:42:31 UTC (rev 4768)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2006-06-15 15:31:16 UTC (rev 4769)
@@ -39,7 +39,6 @@
 import org.jboss.forge.status.common.Tags;
 import org.jboss.forge.status.exceptions.InvalidPluginsConfigurationException;
 import org.jboss.forge.status.exceptions.GetScoresException;
-import org.jboss.forge.status.exceptions.ScoresException;
 import org.jboss.forge.status.exceptions.ScoresSaveException;
 import org.jboss.forge.status.service.impl.protocol.PluginConfImpl;
 import org.jboss.forge.status.service.impl.protocol.ServiceConfImpl;
@@ -86,7 +85,7 @@
 	 */
 	public Status(String portalName, Node statusRoot, Node pluginsRoot,
 								org.jboss.shotoku.Node serviceNode) 
-												throws ScoresException {
+												throws GetScoresException {
 		
 		log = Logger.getLogger(this.getClass());
 		
@@ -99,18 +98,18 @@
 		
 		PluginsValues pluginsValues;
 		
-		try { 
-			// Get latest available scores
-			ScoresManager.init(portalName, serviceConf);
-			pluginsValues = ScoresManager.getLatestScores();
-			updateDate = pluginsValues.getDate();
-			
-			// Compute and save current scores
+		//	Compute and save current scores
+		try {
 			ScoresManager.save(projects, pluginsConf);
-			
 		} catch (ScoresSaveException e) {
 			log.error("Saving scores failed ", e);
-			throw e;
+		}
+		
+		//	Get latest available scores
+		try { 	
+			ScoresManager.init(portalName, serviceConf);
+			pluginsValues = ScoresManager.getLatestScores();
+			updateDate = pluginsValues.getDate();
 		} catch (GetScoresException e) {
 			log.error("Getting computed scores failed ", e);
 			throw e;

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java	2006-06-15 13:42:31 UTC (rev 4768)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java	2006-06-15 15:31:16 UTC (rev 4769)
@@ -16,8 +16,7 @@
 	public static final String STATUS_REMOTE_SERVICE 		= "Status/RemoteScoresService";
 	
 	public static final long CACHE_INTERVAL 					= 5*60*1000; /* milliseconds */
-															  //TODO conf via cms?
-
+	
 	/**
 	 * This class cannot be instatiated.
 	 */

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java	2006-06-15 13:42:31 UTC (rev 4768)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java	2006-06-15 15:31:16 UTC (rev 4769)
@@ -92,7 +92,7 @@
 				return ScoresManagerSync.getScores(cal);
 			}
 			
-			if ((attempts++) == Constants.MAX_ATTEMPTS) {
+			if ((++attempts) == Constants.MAX_ATTEMPTS) {
 				throw new GetScoresException(
 						"Can not find any recently saved scores. " +
 						"Gave up after " + attempts + " attempts.");

[Jboss-svn-commits] JBL Code SVN: r4767 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: common service/impl service/impl/protocol service/protocol tools

From: <jbo...@li...> - 2006-06-15 14:49:53

Author: wrzep
Date: 2006-06-15 08:29:40 -0400 (Thu, 15 Jun 2006)
New Revision: 4767

Removed:
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresRequestImpl.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresResponseImpl.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresRequest.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresResponse.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/RecordManager.java
Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
Log:
JBLAB-599
Cleanup after simplifying getting and refreshing scores.
Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java	2006-06-15 11:37:04 UTC (rev 4766)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Constants.java	2006-06-15 12:29:40 UTC (rev 4767)
@@ -11,7 +11,6 @@
 
 	public static final String NAME_PROPERTY 				= "name";
 	public static final String SAVE_MESSAGE 					= "save";
-	public static final String GET_SCORES_MESSAGE 			= "get";
 	
 	public static final String STATUS_LOCAL_SERVICE	 		= "Status/LocalScoresService";
 	public static final String STATUS_REMOTE_SERVICE 		= "Status/RemoteScoresService";

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java	2006-06-15 11:37:04 UTC (rev 4766)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java	2006-06-15 12:29:40 UTC (rev 4767)
@@ -22,8 +22,6 @@
 
 package org.jboss.forge.status.service.impl;
 
-import java.sql.Timestamp;
-import java.util.Calendar;
 import java.util.List;
 
 import javax.ejb.ActivationConfigProperty;
@@ -36,16 +34,10 @@
 import org.jboss.forge.common.projects.Projects;
 
 import org.jboss.forge.status.common.Constants;
-import org.jboss.forge.status.exceptions.GetScoresException;
 import org.jboss.forge.status.exceptions.ScoresSaveException;
-import org.jboss.forge.status.service.impl.protocol.GetScoresResponseImpl;
-import org.jboss.forge.status.service.protocol.GetScoresRequest;
-import org.jboss.forge.status.service.protocol.GetScoresResponse;
 import org.jboss.forge.status.service.protocol.PluginConf;
-import org.jboss.forge.status.service.protocol.PluginsValues;
 import org.jboss.forge.status.service.protocol.SaveRequest;
 
-import org.jboss.forge.status.tools.RecordManager;
 import org.jboss.forge.status.tools.ScoresManagerSync;
 import org.jboss.logging.Logger;
 
@@ -79,14 +71,9 @@
 				
 				SaveRequest saveRequest = (SaveRequest) message.getObject();
 				handleRequest(saveRequest);
+			} else {
+				log.info("Unknown request: " + requestName);
 			}
-			
-			if (requestName.equals(Constants.GET_SCORES_MESSAGE)) {
-
-				GetScoresRequest getScoresRequest =
-										(GetScoresRequest) message.getObject();
-				handleRequest(getScoresRequest);
-			}
 		
 			log.info("Finished processing request: " + requestName);
 			
@@ -106,24 +93,5 @@
 			log.warn("Error processing save request.", e);
 		}		
 	}
-
-	private static void handleRequest(GetScoresRequest request) {
-		
-		Calendar cal = request.getCalendar();
-		Timestamp timestamp = request.getTimestamp();
-		
-		PluginsValues pluginsValues = null;
-		try {
-			pluginsValues = ScoresManagerSync.getScores(cal);
-		} catch (GetScoresException e) {
-			log.warn("Error processing get request, returning null values.");
-			// If something is wrong, response will contain null pluginsValues
-		}
-		
-		GetScoresResponse response =
-						new GetScoresResponseImpl(pluginsValues, request);
-		
-		RecordManager.add(timestamp, response);
-	}
 	
 }

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresRequestImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresRequestImpl.java	2006-06-15 11:37:04 UTC (rev 4766)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresRequestImpl.java	2006-06-15 12:29:40 UTC (rev 4767)
@@ -1,56 +0,0 @@
-/*
- * 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.forge.status.service.impl.protocol;
-
-import java.sql.Timestamp;
-import java.util.Calendar;
-import org.jboss.forge.status.service.protocol.GetScoresRequest;
-
-/**
-* @author Pawel Wrzeszcz
-*/
-public class GetScoresRequestImpl implements GetScoresRequest {
-	
-	private static final long serialVersionUID = 7844595317056960170L;
-	
-	private Calendar cal;
-	private Timestamp timestamp;
-	
-	public GetScoresRequestImpl(Calendar cal,
-								Timestamp timestamp) {
-	
-		this.cal = cal;
-		this.timestamp = timestamp;
-	}
-
-	public Calendar getCalendar() {
-		return cal;
-	}
-
-	public Timestamp getTimestamp() {
-		return timestamp;
-	}
-	
-	
-
-}
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresResponseImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresResponseImpl.java	2006-06-15 11:37:04 UTC (rev 4766)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresResponseImpl.java	2006-06-15 12:29:40 UTC (rev 4767)
@@ -1,54 +0,0 @@
-/*
- * 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.forge.status.service.impl.protocol;
-
-import org.jboss.forge.status.service.protocol.GetScoresRequest;
-import org.jboss.forge.status.service.protocol.GetScoresResponse;
-import org.jboss.forge.status.service.protocol.PluginsValues;
-
-/**
-* @author Pawel Wrzeszcz
-*/
-public class GetScoresResponseImpl implements GetScoresResponse {
-	
-	private static final long serialVersionUID = 7844595317056960170L;
-	
-	private PluginsValues pluginsValues;
-	private GetScoresRequest request;
-	
-	public GetScoresResponseImpl(PluginsValues pluginsValues,
-								GetScoresRequest request) {
-	
-		this.pluginsValues = pluginsValues;
-		this.request = request;
-	}
-
-	public PluginsValues getPluginsValues() {
-		return pluginsValues;
-	}
-	
-	public GetScoresRequest getRequest() {
-		return request;
-	}
-
-}
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresRequest.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresRequest.java	2006-06-15 11:37:04 UTC (rev 4766)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresRequest.java	2006-06-15 12:29:40 UTC (rev 4767)
@@ -1,38 +0,0 @@
-/*
- * 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.forge.status.service.protocol;
-
-import java.io.Serializable;
-import java.sql.Timestamp;
-import java.util.Calendar;
-
-/**
-* @author Pawel Wrzeszcz
-*/
-public interface GetScoresRequest extends Serializable {
-	
-	public Calendar getCalendar();
-
-	public Timestamp getTimestamp();
-
-}
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresResponse.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresResponse.java	2006-06-15 11:37:04 UTC (rev 4766)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresResponse.java	2006-06-15 12:29:40 UTC (rev 4767)
@@ -1,36 +0,0 @@
-/*
- * 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.forge.status.service.protocol;
-
-import java.io.Serializable;
-
-/**
-* @author Pawel Wrzeszcz
-*/
-public interface GetScoresResponse extends Serializable {
-	
-	public PluginsValues getPluginsValues();
-	
-	public GetScoresRequest getRequest();
-
-}
\ No newline at end of file

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/RecordManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/RecordManager.java	2006-06-15 11:37:04 UTC (rev 4766)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/RecordManager.java	2006-06-15 12:29:40 UTC (rev 4767)
@@ -1,44 +0,0 @@
-package org.jboss.forge.status.tools;
-
-import java.sql.Timestamp;
-import java.util.ArrayList;
-
-import org.jboss.forge.status.service.protocol.GetScoresResponse;
-
-/**
- * @author Pawel Wrzeszcz
- */
-public class RecordManager {
-	
-	private static ArrayList<GetScoresResponse> buff =
-	      new ArrayList<GetScoresResponse> ();
-	
-	  private static int maxSize = 100;
-
-	  public static void add (Timestamp sent, GetScoresResponse response) {
-		  
-	    // Remove the earliest item if the cache is full
-	    if (buff.size () > maxSize) {
-	      buff.remove (0);
-	    }
-
-	    buff.add(response);
-	  }
-	  
-	  public static GetScoresResponse get(Timestamp sent) {
-		  
-	    for (int i = 0; i < buff.size (); i++) {
-	    	
-	    		GetScoresResponse resp = buff.get(i);
-	    		Timestamp ts = resp.getRequest().getTimestamp();
-	    		
-	    		if (ts.equals(sent)) {
-	    			
-	    			buff.remove(i);
-	    			return resp;
-	    		}
-	    }
-	    return null;
-	  }
-	
-}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java	2006-06-15 11:37:04 UTC (rev 4766)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java	2006-06-15 12:29:40 UTC (rev 4767)
@@ -23,7 +23,6 @@
 package org.jboss.forge.status.tools;
 
 import java.io.Serializable;
-import java.sql.Timestamp;
 import java.util.Calendar;
 import java.util.List;
 import java.util.Properties;
@@ -43,7 +42,6 @@
 import org.jboss.forge.status.exceptions.GetScoresException;
 import org.jboss.forge.status.exceptions.ScoresSaveException;
 import org.jboss.forge.status.service.impl.protocol.SaveRequestImpl;
-import org.jboss.forge.status.service.protocol.GetScoresResponse;
 import org.jboss.forge.status.service.protocol.PluginConf;
 import org.jboss.forge.status.service.protocol.PluginsValues;
 import org.jboss.forge.status.service.protocol.SaveRequest;
@@ -80,32 +78,6 @@
 		}
 	}
 	
-	public static PluginsValues getScores(Timestamp timestamp)
-										throws GetScoresException {
-	
-		
-		GetScoresResponse response = RecordManager.get(timestamp);
-		
-		System.out.println("attempt");
-		
-		if (response == null) {
-			return null;
-		}
-		
-		PluginsValues pluginsValues = response.getPluginsValues();
-		
-		if (pluginsValues == null) {
-			try {
-				sendMessage(Constants.GET_SCORES_MESSAGE,
-													response.getRequest());
-			} catch (Exception e) {
-				throw new GetScoresException(e);
-			}
-		}
-		
-		return pluginsValues;
-	}
-	
 	public static PluginsValues getLatestScores()
 									throws GetScoresException {

[Jboss-svn-commits] JBL Code SVN: r4768 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: . exceptions tools

From: <jbo...@li...> - 2006-06-15 13:42:45

Author: wrzep
Date: 2006-06-15 09:42:31 -0400 (Thu, 15 Jun 2006)
New Revision: 4768

Added:
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/ScoresException.java
Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/GetScoresException.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/ScoresSaveException.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
Log:
JBLAB-599
bug fix (NPE when recent scores were not available)
Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2006-06-15 12:29:40 UTC (rev 4767)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2006-06-15 13:42:31 UTC (rev 4768)
@@ -39,6 +39,7 @@
 import org.jboss.forge.status.common.Tags;
 import org.jboss.forge.status.exceptions.InvalidPluginsConfigurationException;
 import org.jboss.forge.status.exceptions.GetScoresException;
+import org.jboss.forge.status.exceptions.ScoresException;
 import org.jboss.forge.status.exceptions.ScoresSaveException;
 import org.jboss.forge.status.service.impl.protocol.PluginConfImpl;
 import org.jboss.forge.status.service.impl.protocol.ServiceConfImpl;
@@ -84,7 +85,8 @@
 	 * @param pluginsRoot Node defining Plugins used in the Matrix
 	 */
 	public Status(String portalName, Node statusRoot, Node pluginsRoot,
-								org.jboss.shotoku.Node serviceNode) {
+								org.jboss.shotoku.Node serviceNode) 
+												throws ScoresException {
 		
 		log = Logger.getLogger(this.getClass());
 		
@@ -96,6 +98,7 @@
 		ScoresManagerSync.init(portalName, serviceConf);
 		
 		PluginsValues pluginsValues;
+		
 		try { 
 			// Get latest available scores
 			ScoresManager.init(portalName, serviceConf);
@@ -107,10 +110,10 @@
 			
 		} catch (ScoresSaveException e) {
 			log.error("Saving scores failed ", e);
-			return;
+			throw e;
 		} catch (GetScoresException e) {
 			log.error("Getting computed scores failed ", e);
-			return;
+			throw e;
 		}
 		
 		// Get columns to display on the main page

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java	2006-06-15 12:29:40 UTC (rev 4767)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java	2006-06-15 13:42:31 UTC (rev 4768)
@@ -22,10 +22,12 @@
 
 package org.jboss.forge.status;
 
+import java.util.HashMap;
 import java.util.Map;
 import java.io.IOException;
 
 import org.jboss.forge.status.common.Locations;
+import org.jboss.forge.status.exceptions.ScoresException;
 import org.jboss.portal.common.context.DelegateContext;
 
 import org.jboss.shotoku.ContentManager;
@@ -44,14 +46,28 @@
  */
 public class StatusDescriptor {
 	
-	private DelegateContext context;
-	private Map<String,DelegateContext> projectContexts;
-	private Map<String,DelegateContext> columnContexts;
+	private DelegateContext context = new DelegateContext();
 	
+	private Map<String,DelegateContext> projectContexts
+								= new HashMap<String,DelegateContext>();
+	private Map<String,DelegateContext> columnContexts
+	 							= new HashMap<String,DelegateContext>();
+	
+	private String portalName;
+	private ContentManager cm;
+	
 	private Status status;
 	
 	public StatusDescriptor(String portalName, ContentManager cm) {
 		
+		this.portalName = portalName;
+		this.cm = cm;
+		
+		init();
+	}
+
+	private void init() {
+		
 		try {		
 			String statusPath = Locations.getXmlCmPath(portalName);
 			Node statusRoot = getRoot(cm , statusPath);
@@ -67,19 +83,22 @@
 			
 			fillContext();
 			
+		} catch (ScoresException e){
+			// do nothing
 		} catch (Exception e) {
 			e.printStackTrace();
 		} 
 	}
 
 	private void fillContext() {
-	
-		context = new DelegateContext();	
-		status.fillContext(context);
 		
-		projectContexts = status.getProjectContexts();
-		columnContexts = status.getColumnContexts();
-		
+		if (status != null) {
+			
+			status.fillContext(context);
+			
+			projectContexts = status.getProjectContexts();
+			columnContexts = status.getColumnContexts();
+		}	
 	}
 
 	public DelegateContext getContext() {
@@ -107,7 +126,11 @@
 
 	public void update() {
 		
-		if (status.needsUpdate()) {
+		if (status == null) {
+			init();
+		}
+		
+		if ((status != null) && (status.needsUpdate())) {
 			fillContext();
 		}
 	}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/GetScoresException.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/GetScoresException.java	2006-06-15 12:29:40 UTC (rev 4767)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/GetScoresException.java	2006-06-15 13:42:31 UTC (rev 4768)
@@ -27,7 +27,7 @@
 * Indicates that searching for saved scores failed. 
 */
 
-public class GetScoresException extends Exception {
+public class GetScoresException extends ScoresException {
 
 	private static final long serialVersionUID = 7291136165537810321L;
 
@@ -38,5 +38,9 @@
 	public GetScoresException(Exception e) {
 		super(e);
 	}
+
+	public GetScoresException(String msg) {
+		super(msg);
+	}
 	
 }

Added: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/ScoresException.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/ScoresException.java	2006-06-15 12:29:40 UTC (rev 4767)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/ScoresException.java	2006-06-15 13:42:31 UTC (rev 4768)
@@ -0,0 +1,44 @@
+/*
+ * 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.forge.status.exceptions;
+
+/**
+* @author Pawel Wrzeszcz (paw...@gm...) 
+*/
+
+public class ScoresException extends Exception {
+
+	private static final long serialVersionUID = -8228803296975062691L;
+
+	public ScoresException() {
+		super();
+	}
+	
+	public ScoresException(Exception e) {
+		super(e);
+	}
+	
+	public ScoresException(String msg) {
+		super(msg);
+	}
+}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/ScoresSaveException.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/ScoresSaveException.java	2006-06-15 12:29:40 UTC (rev 4767)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/exceptions/ScoresSaveException.java	2006-06-15 13:42:31 UTC (rev 4768)
@@ -27,7 +27,7 @@
 * Indicates that computing or saving scores failed. 
 */
 
-public class ScoresSaveException extends Exception {
+public class ScoresSaveException extends ScoresException {
 
 	private static final long serialVersionUID = 7291136165537810321L;
 

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java	2006-06-15 12:29:40 UTC (rev 4767)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java	2006-06-15 13:42:31 UTC (rev 4768)
@@ -93,7 +93,9 @@
 			}
 			
 			if ((attempts++) == Constants.MAX_ATTEMPTS) {
-				return null;
+				throw new GetScoresException(
+						"Can not find any recently saved scores. " +
+						"Gave up after " + attempts + " attempts.");
 			}
 			
 			cal.add(Calendar.DAY_OF_MONTH, -1);

[Jboss-svn-commits] JBL Code SVN: r4766 - in labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status: . plugins/codelines tools

From: <jbo...@li...> - 2006-06-15 11:37:15

Author: wrzep
Date: 2006-06-15 07:37:04 -0400 (Thu, 15 Jun 2006)
New Revision: 4766

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesEvaluator.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
Log:
JBLAB-599
Definitely simplified getting and refreshing scores.
Pawel


Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2006-06-15 08:02:09 UTC (rev 4765)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2006-06-15 11:37:04 UTC (rev 4766)
@@ -22,7 +22,6 @@
 
 package org.jboss.forge.status;
 
-import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.Calendar;
 import java.util.HashMap;
@@ -75,7 +74,7 @@
 
 	private List<PluginConf> pluginsConf;
 	
-	private Timestamp timestamp;
+	private Calendar updateDate;
 	
 	private Logger log;
 	
@@ -101,10 +100,11 @@
 			// Get latest available scores
 			ScoresManager.init(portalName, serviceConf);
 			pluginsValues = ScoresManager.getLatestScores();
+			updateDate = pluginsValues.getDate();
 			
 			// Compute and save current scores
 			ScoresManager.save(projects, pluginsConf);
-			timestamp = ScoresManager.requestCurrentScores();
+			
 		} catch (ScoresSaveException e) {
 			log.error("Saving scores failed ", e);
 			return;
@@ -217,54 +217,52 @@
 		
 		log.info("Checking for updated scores.");
 		
-		PluginsValues pluginsValues;
+		PluginsValues pluginsValues = null;
 		
+		// Check for updated scores
 		try {
-			pluginsValues = ScoresManager.getScores(timestamp);
+			pluginsValues = ScoresManager.getLatestScores();
 		} catch (GetScoresException e) {
-			log.warn("Resending \"get\" request failed.");
-			return false;
+			log.warn("Failed to get lates scores.");
 		}
 		
-		if (pluginsValues == null) {
-			
-			Calendar tsCal = Calendar.getInstance();
-			tsCal.setTime(timestamp);
-			Calendar now = Calendar.getInstance();
-			
-			if (tsCal.get(Calendar.DAY_OF_MONTH) !=
-											now.get(Calendar.DAY_OF_MONTH)) {
-				
-				try {
-					ScoresManager.save(projects, pluginsConf);
-							//TODO *Maybe* get rid of "save", have only "get"
-							// and service performing "save" on it's own
-							// (after necessary init or using it own conf)?
-					timestamp = ScoresManager.requestCurrentScores();
-				} catch (ScoresSaveException e) {
-					log.warn("Sending \"save\" request failed.");
-				} catch (GetScoresException e) {
-					log.warn("Sending \"get\" request failed.");
-				}
+		// Perform save if needed
+		if ((pluginsValues == null) || needsSave(pluginsValues.getDate())){
+							
+			try {
+				ScoresManager.save(projects, pluginsConf);
+			} catch (ScoresSaveException e) {
+				log.warn("Sending \"save\" request failed.");
 			}
-			
-			return false;
 		}
 		
+		// Refresh if scores are new
+		if ((pluginsValues != null) &&
+					(pluginsValues.getDate() != updateDate)) {
+		
+			refreshScores(pluginsValues);
+		}
+		
+		return true;
+	}
+
+	private boolean needsSave(Calendar date) {
+		
+		Calendar now = Calendar.getInstance();
+		
+		return (now.get(Calendar.DAY_OF_MONTH) != date.get(Calendar.DAY_OF_MONTH));
+	}
+
+	private void refreshScores(PluginsValues pluginsValues) {
+		
 		log.info("Refreshing scores...");
 		
 		mainPageColumns.update(pluginsValues);
 		matrixTemplate.update(pluginsValues);
 		
-		log.info("Finished refreshing scores.");
+		updateDate = pluginsValues.getDate();
 		
-		try {
-			timestamp = ScoresManager.requestCurrentScores();
-		} catch (GetScoresException e) {
-			log.warn("Sending \"get\" request failed.");
-		}
-		
-		return true;
+		log.info("Finished refreshing scores.");
 	}
 
 }
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesEvaluator.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesEvaluator.java	2006-06-15 08:02:09 UTC (rev 4765)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesEvaluator.java	2006-06-15 11:37:04 UTC (rev 4766)
@@ -128,7 +128,7 @@
     	repository.setAuthenticationManager(authManager);
         
         /* Analyze */
-        log.debug("Analyzing repository " + repository.getLocation() + ".");
+        log.info("Analyzing repository " + repository.getLocation() + ".");
         
         return repository;
 	}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java	2006-06-15 08:02:09 UTC (rev 4765)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/codelines/CodeLinesPlugin.java	2006-06-15 11:37:04 UTC (rev 4766)
@@ -57,11 +57,6 @@
 	@Override
 	public long getValue(String projectId) {
 		
-		System.out.print("clp getValue: ");
-		System.out.print(projectId + " ");
-		System.out.println(cachedValues);
-		//TODO and now NPE appears, where exactly??
-		
 		if (!cachedValues.containsKey(projectId)) {
 			
 			long cl = 0;
@@ -79,6 +74,8 @@
 			}
 		}
 		
-		return cachedValues.get(projectId).longValue();
+		Long value = cachedValues.get(projectId);
+	
+		return value == null ? 0 : value.longValue();
 	}
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java	2006-06-15 08:02:09 UTC (rev 4765)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java	2006-06-15 11:37:04 UTC (rev 4766)
@@ -42,9 +42,7 @@
 import org.jboss.forge.common.projects.Projects;
 import org.jboss.forge.status.exceptions.GetScoresException;
 import org.jboss.forge.status.exceptions.ScoresSaveException;
-import org.jboss.forge.status.service.impl.protocol.GetScoresRequestImpl;
 import org.jboss.forge.status.service.impl.protocol.SaveRequestImpl;
-import org.jboss.forge.status.service.protocol.GetScoresRequest;
 import org.jboss.forge.status.service.protocol.GetScoresResponse;
 import org.jboss.forge.status.service.protocol.PluginConf;
 import org.jboss.forge.status.service.protocol.PluginsValues;
@@ -81,31 +79,6 @@
 			throw new ScoresSaveException(e);
 		}
 	}
-
-	public static Timestamp requestScores(Calendar cal)
-										throws GetScoresException {
-		
-		Timestamp timestamp = new Timestamp(System.currentTimeMillis());
-		
-		GetScoresRequest getScoresRequest =
-						new GetScoresRequestImpl(cal, timestamp);
-
-		try {
-			sendMessage(Constants.GET_SCORES_MESSAGE, getScoresRequest);
-		} catch (Exception e) {
-			throw new GetScoresException(e);
-		}
-		
-		return timestamp;
-	}
-
-	public static Timestamp requestCurrentScores()
-									throws GetScoresException {
-		
-		Calendar cal = Calendar.getInstance();
-		
-		return requestScores(cal);
-	}
 	
 	public static PluginsValues getScores(Timestamp timestamp)
 										throws GetScoresException {

[Jboss-svn-commits] JBL Code SVN: r4765 - in labs/jbossrules/trunk/drools-compiler/src/test: java/org/drools/integrationtests resources/org/drools/integrationtests

From: <jbo...@li...> - 2006-06-15 08:02:21

Author: mic...@jb...
Date: 2006-06-15 04:02:09 -0400 (Thu, 15 Jun 2006)
New Revision: 4765

Added:
   labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ExplicitAnd.drl
Modified:
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
Log:
JBRULES-312

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java	2006-06-15 03:45:54 UTC (rev 4764)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/integrationtests/IntegrationCases.java	2006-06-15 08:02:09 UTC (rev 4765)
@@ -165,6 +165,31 @@
                       list.get( 0 ) );
     }
 
+    public void FIXME_testExplicitAnd() throws Exception {
+        final Reader reader = new InputStreamReader( 
+                                   getClass().getResourceAsStream( "test_ExplicitAnd.drl" ) );
+        final DrlParser parser = new DrlParser();
+        final PackageDescr packageDescr = parser.parse( reader );
+
+        //pre build the package
+        final PackageBuilder builder = new PackageBuilder();
+        builder.addPackage( packageDescr );
+        final Package pkg = builder.getPackage();
+
+        //add the package to a rulebase
+        final RuleBase ruleBase = getRuleBase();
+        ruleBase.addPackage( pkg );
+        //load up the rulebase
+
+        final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
+        List list = new ArrayList();
+        workingMemory.setGlobal( "list", list );
+        workingMemory.assertObject( new Message("hola") );
+        
+        workingMemory.fireAllRules();
+        assertEquals(0, list.size());
+    }
+    
     public void testHelloWorld() throws Exception {
 
         //read in the source

Added: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ExplicitAnd.drl
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ExplicitAnd.drl	2006-06-15 03:45:54 UTC (rev 4764)
+++ labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ExplicitAnd.drl	2006-06-15 08:02:09 UTC (rev 4765)
@@ -0,0 +1,13 @@
+package HelloWorld
+ 
+import org.drools.integrationtests.helloworld.Message
+import java.lang.*
+
+global java.util.List list;
+
+rule "Hello World"
+	when
+		Message() && Integer()
+	then
+		list.add("hola");
+end
\ No newline at end of file


Property changes on: labs/jbossrules/trunk/drools-compiler/src/test/resources/org/drools/integrationtests/test_ExplicitAnd.drl
___________________________________________________________________
Name: svn:eol-style
   + native

[Jboss-svn-commits] JBL Code SVN: r4764 - in labs/jbossrules/trunk/drools-compiler/src: main/java/org/drools/compiler test/java/org/drools/compiler

From: <jbo...@li...> - 2006-06-15 03:46:01

Author: mic...@jb...
Date: 2006-06-14 23:45:54 -0400 (Wed, 14 Jun 2006)
New Revision: 4764

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
Log:
JBRULES-311

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2006-06-15 03:44:45 UTC (rev 4763)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/compiler/PackageBuilder.java	2006-06-15 03:45:54 UTC (rev 4764)
@@ -19,9 +19,11 @@
 import java.io.IOException;
 import java.io.Reader;
 import java.util.ArrayList;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 import org.apache.commons.jci.compilers.CompilationResult;
 import org.apache.commons.jci.compilers.JavaCompiler;
@@ -160,11 +162,9 @@
 
     public void addPackage(final PackageDescr packageDescr) {
 
-        if ( packageDescr.getName() == null || "".equals( packageDescr.getName() ) ) {
+        validatePackageName( packageDescr );
+        validateUniqueRuleNames( packageDescr );
 
-            throw new MissingPackageNameException( "Missing package name for rule package." );
-        }
-
         if ( this.pkg != null ) {
             //mergePackage( packageDescr ) ;
             mergePackage( this.pkg,
@@ -187,6 +187,25 @@
         }
     }
 
+    private void validatePackageName(final PackageDescr packageDescr) {
+        if ( packageDescr.getName() == null || "".equals( packageDescr.getName() ) ) {
+
+            throw new MissingPackageNameException( "Missing package name for rule package." );
+        }
+    }
+
+    private void validateUniqueRuleNames(final PackageDescr packageDescr) {
+        Set names = new HashSet();
+        for ( Iterator iter = packageDescr.getRules().iterator(); iter.hasNext(); ) {
+            RuleDescr rule = (RuleDescr) iter.next();
+            String name = rule.getName();
+            if (names.contains( name )) {
+                this.results.add( new ParserError("Duplicate rule name: " + name, rule.getLine(), rule.getColumn()) );
+            }
+            names.add( name );
+        }
+    }
+
     private Package newPackage(final PackageDescr packageDescr) {
         final Package pkg = new Package( packageDescr.getName(),
                                    this.configuration.getClassLoader() );

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java	2006-06-15 03:44:45 UTC (rev 4763)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/compiler/PackageBuilderTest.java	2006-06-15 03:45:54 UTC (rev 4764)
@@ -725,7 +725,64 @@
         assertLength( 0,
                       builder.getErrors() );
     }
+    
+    public void testDuplicateRuleNames() throws Exception {
+        
+        final PackageBuilder builder = new PackageBuilder();
 
+        final PackageDescr packageDescr = new PackageDescr( "p1" );
+
+        RuleDescr ruleDescr = new RuleDescr( "rule-1" );
+        packageDescr.addRule( ruleDescr );
+        AndDescr lhs = new AndDescr();
+        ruleDescr.setLhs( lhs );
+        ColumnDescr columnDescr = new ColumnDescr( Cheese.class.getName(),
+                                                   "stilton" );
+        LiteralDescr literalDescr = new LiteralDescr( "type",
+                                                      "==",
+                                                      null );
+        columnDescr.addDescr( literalDescr );
+        ruleDescr.setConsequence( "" );
+        
+        ruleDescr = new RuleDescr( "rule-1" );
+        ruleDescr.setLocation( 42, 43 );
+        packageDescr.addRule( ruleDescr );
+        lhs = new AndDescr();
+        ruleDescr.setLhs( lhs );
+        columnDescr = new ColumnDescr( Cheese.class.getName(),
+                                                   "stilton" );
+        literalDescr = new LiteralDescr( "type",
+                                                      "!=",
+                                                      null );
+        columnDescr.addDescr( literalDescr );
+        ruleDescr.setConsequence( "" );
+        
+        
+        ruleDescr = new RuleDescr( "rule-2" );
+        ruleDescr.setLocation( 42, 43 );
+        packageDescr.addRule( ruleDescr );
+        lhs = new AndDescr();
+        ruleDescr.setLhs( lhs );
+        columnDescr = new ColumnDescr( Cheese.class.getName(),
+                                                   "stilton" );
+        literalDescr = new LiteralDescr( "type",
+                                                      "!=",
+                                                      null );
+        columnDescr.addDescr( literalDescr );
+        ruleDescr.setConsequence( "" );        
+
+        builder.addPackage( packageDescr );
+
+        
+        
+        assertLength( 1,
+                      builder.getErrors() );
+        ParserError err = (ParserError) builder.getErrors()[0];
+        assertEquals(42, err.getRow());
+        assertEquals(43, err.getCol());
+       
+    }
+
     private void createReturnValueRule(final PackageDescr packageDescr,
                                        final String expression) {
         final RuleDescr ruleDescr = new RuleDescr( "rule-1" );

[Jboss-svn-commits] JBL Code SVN: r4763 - labs/jbossrules/trunk

From: <jbo...@li...> - 2006-06-15 03:44:52

Author: mic...@jb...
Date: 2006-06-14 23:44:45 -0400 (Wed, 14 Jun 2006)
New Revision: 4763

Modified:
   labs/jbossrules/trunk/build.xml
Log:
changed to fail build if a test doesn't pass

Modified: labs/jbossrules/trunk/build.xml
===================================================================
--- labs/jbossrules/trunk/build.xml	2006-06-15 00:29:26 UTC (rev 4762)
+++ labs/jbossrules/trunk/build.xml	2006-06-15 03:44:45 UTC (rev 4763)
@@ -237,7 +237,7 @@
         </classpath>
       </javac>      
     
-      <junit printsummary="yes" fork="yes" forkmode="once">
+      <junit printsummary="yes" fork="yes" forkmode="once" haltonfailure="on">
         <sysproperty key="jsr94.tck.configuration" value="${module}/target/test-classes/org/drools/jsr94/tck"/>
         <classpath>
           <path refid="${module}.dependency.classpath"/>

[Jboss-svn-commits] JBL Code SVN: r4762 - in labs/jbosslabs/branches/qa/jbosslabs/portal-extensions: forge-ads forge-ads/src/java/org/jbosslabs/portlet/ads forge-blog/src/java/org/jboss/portlet/blog forge-common/src/java/org/jboss/forge/common/projects forge-mapper/src/java/org/jboss/labs/mapper forge-status/src/java/org/jboss/forge/status/tools forge-tagme/src/java/org/jboss/labs/tagme forge-tagme/src/java/org/jboss/labs/tagme/gwt/client forge-tagme/src/java/org/jboss/labs/tagme/services jbosswiki/wiki-common/src/java/org/jboss/wiki portal-binaries/to-copy/jboss-portal.sar/META-INF portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user portal-binaries/to-copy/jboss-portal.sar/lib portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar portal-binaries/to-copy/jboss-portal.sar/portal-cms.sa! r/META-INF portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/META-INF portal-binaries/to-copy/jboss-portal.sar/portal-core.war/META-INF portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/META-INF portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF portal-binaries/to-copy/jboss-portal.sar/portal-server.war/META-INF

From: <jbo...@li...> - 2006-06-15 00:29:57

Author: dam...@jb...
Date: 2006-06-14 20:29:26 -0400 (Wed, 14 Jun 2006)
New Revision: 4762

Added:
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-ads/forge-ads.iml
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/ehcache.xml
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/ehcache.xml
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/ehcache.xml
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/ehcache.xml
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/web.xml
Modified:
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/IssueTracker.java
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Repository.java
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeClickListener.java
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/META-INF/MANIFEST.MF
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/hibernate.cfg.xml
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/hibernate.cfg.xml
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/hibernate.cfg.xml
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/hibernate.cfg.xml
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/ehcache.jar
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-bridge-lib.jar
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-common-lib.jar
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-core-lib.jar
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-faces-lib.jar
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-format-lib.jar
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-portlet-lib.jar
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-security-lib.jar
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-server-lib.jar
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-theme-lib.jar
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portlet-api-lib.jar
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/MANIFEST.MF
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms-lib.jar
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/META-INF/MANIFEST.MF
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/META-INF/MANIFEST.MF
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/META-INF/MANIFEST.MF
   labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/META-INF/MANIFEST.MF
Log:
MERGED: -r 4711:4761 https://svn.labs.jboss.com/labs/jbosslabs/trunk into qa for Labs 1.1 POST-promote testing.  Bug fixes for prod.

Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-ads/forge-ads.iml (from rev 4761, labs/jbosslabs/trunk/portal-extensions/forge-ads/forge-ads.iml)

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-ads/src/java/org/jbosslabs/portlet/ads/AdsPortlet.java	2006-06-15 00:29:26 UTC (rev 4762)
@@ -28,6 +28,7 @@
 import org.jboss.forge.common.projects.Projects;
 import org.jboss.forge.common.projects.ProjectsHelper;
 import org.jboss.forge.common.projects.permissions.NullPermissionsChecker;
+import org.jboss.forge.common.projects.permissions.RenderRequestPermissionsChecker;
 import org.jboss.portal.core.servlet.jsp.PortalJsp;
 import org.jboss.portal.common.context.DelegateContext;
 import org.jboss.shotoku.exceptions.ResourceDoesNotExist;
@@ -62,10 +63,10 @@
     		Projects projects = ProjectsHelper.getProjects(portalName);
     		        	
         	DelegateContext context = projects.getProjectContext(
-        									new NullPermissionsChecker(),
+        									new RenderRequestPermissionsChecker(rReq),
         									projectId);
         	
-        	if ((context.childIterator("ads") != null)
+        	if ((context != null) && (context.childIterator("ads") != null)
         				&& context.childIterator("ads").hasNext()) {
         		return context;
         	} else { // If project ads are not specified show default ads 
@@ -115,7 +116,7 @@
         rReq.setAttribute(PortalJsp.CTX_REQUEST, content);
         writeJsp(rReq, rRes, fileName);
     }
-
+
     protected static String[] parse(String target) {
         String[] cnt;
         String[] separated;

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-blog/src/java/org/jboss/portlet/blog/BlogPortlet.java	2006-06-15 00:29:26 UTC (rev 4762)
@@ -176,6 +176,10 @@
         SyndFeed feed = blogFeed.get(new Triple<String, String, String>(portalName, projectId,
                 feedAddress));
 
+        if (feed == null) {
+            return;
+        }
+
         WindowState ws = request.getWindowState();
 
         String currentWindowState = "maximized";

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java	2006-06-15 00:29:26 UTC (rev 4762)
@@ -133,7 +133,7 @@
                 Queue queue = null;
                 queue = (Queue) ctx.lookup("queue/jblab_counters");
                 QueueConnectionFactory factory =
-                    (QueueConnectionFactory) ctx.lookup("ConnectionFactory");
+                    (QueueConnectionFactory) ctx.lookup("java:/ConnectionFactory");
                 sess =factory.createQueueConnection().createQueueSession(false,
                                                    QueueSession.AUTO_ACKNOWLEDGE);
                 if (sess != null)

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/IssueTracker.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/IssueTracker.java	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/IssueTracker.java	2006-06-15 00:29:26 UTC (rev 4762)
@@ -51,8 +51,11 @@
 		String typeString = XmlTools.getAttributeValue(root, TYPE_ATTRIBUTE);
 		
 		type = JIRA_ISSUE_TRACKER;
-		if (typeString.equalsIgnoreCase(OTHER_ISSUE_TRACKER_STRING)) {
-			type = OTHER_ISSUE_TRACKER;
+		
+		if (typeString != null ) {
+			if (typeString.equalsIgnoreCase(OTHER_ISSUE_TRACKER_STRING)) {
+				type = OTHER_ISSUE_TRACKER;
+			}
 		}
 	}
 

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Repository.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Repository.java	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/Repository.java	2006-06-15 00:29:26 UTC (rev 4762)
@@ -60,12 +60,15 @@
 		
 		type = SVN_REPOSITORY; // default type is SVN
 		
-		if (typeString.equalsIgnoreCase(CVS_REPOSITORY_STRING)) {
-			type = SVN_REPOSITORY;
+		if (typeString != null) {
+		
+			if (typeString.equalsIgnoreCase(CVS_REPOSITORY_STRING)) {
+				type = SVN_REPOSITORY;
+			}
+			if (typeString.equalsIgnoreCase(OTHER_REPOSITORY_STRING)) {
+				type = OTHER_REPOSITORY;
+			}
 		}
-		if (typeString.equalsIgnoreCase(OTHER_REPOSITORY_STRING)) {
-			type = OTHER_REPOSITORY;
-		}
 	}
 
 	public short getType() {

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-mapper/src/java/org/jboss/labs/mapper/LabsCommandMapper.java	2006-06-15 00:29:26 UTC (rev 4762)
@@ -101,7 +101,6 @@
         return (s == null) || ("".equals(s));
     }
 
-    @Inject
     private ContentManager cm;
 
     private void setParamIfNotNull(Parameters params, String name, String value) {
@@ -206,9 +205,10 @@
             try {
                 if (!Constants.PAGES_MIME_TYPE.equalsIgnoreCase(cm.getNode(cmsPath).getMimeType())) {
                     sendRedirect(invocation, "/" + ForgeHelper.FILE_ACCESS_DIR + "/" + cmsPath);
+                    return getPageCommand(invocation, Constants.DEFAULT_PORTAL_PAGE);
                 }
             } catch (Exception e) {
-
+                return getPageCommand(invocation, Constants.DEFAULT_PORTAL_PAGE);
             }
 
             setAttribute(invocation, Constants.ATTR_REQ_PATH, cmsPath);
@@ -279,10 +279,6 @@
     public ControllerCommand doMapping(ServerInvocation invocation,
                                        String portalContextPath, String portalRequestPath)
             throws InvocationException, InvocationRuntimeException {
-        /* TODO remove
-        System.out.println("REQUEST: " + portalRequestPath +
-                " ?" + invocation.getRequest().getContext().getClientRequest().getQueryString());*/
-
         // TODO temporary for freezone
         String projectParam = invocation.getRequest().getContext().getClientRequest()
                 .getParameter(Constants.PROJECT_PARAM);
@@ -290,6 +286,8 @@
             setAttribute(invocation, Constants.PROJECT_PARAM, projectParam);
         }
 
+
+
         // Removing unnecessary /.
         while (portalRequestPath.indexOf("//") != -1) {
             portalRequestPath = portalRequestPath.replace("//", "/");
@@ -430,7 +428,7 @@
 
     @Override
     protected void startService() throws Exception {
-
+        cm = ContentManager.getContentManager();
     }
 
     @Override

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java	2006-06-15 00:29:26 UTC (rev 4762)
@@ -173,7 +173,7 @@
 		
 	    queue = (Queue) context.lookup(Constants.QUEUE_NAME);
 	    QueueConnectionFactory factory =
-	        (QueueConnectionFactory) context.lookup("ConnectionFactory");
+	        (QueueConnectionFactory) context.lookup("java:/ConnectionFactory");
 	    connection = factory.createQueueConnection();
 	    session = connection.createQueueSession(false,
 	            QueueSession.AUTO_ACKNOWLEDGE);

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/TagMeServlet.java	2006-06-15 00:29:26 UTC (rev 4762)
@@ -30,20 +30,23 @@
 
 import com.google.gwt.user.server.rpc.RemoteServiceServlet;
 
-public class TagMeServlet extends RemoteServiceServlet implements TaggingService {
+public class TagMeServlet extends RemoteServiceServlet implements
+		TaggingService {
 
 	private final static Logger log = Logger.getLogger(TagMeServlet.class);
+
 	/**
 	 * 
 	 */
 	private static final long serialVersionUID = 1L;
-	
+
 	public Vector getTags(String path, String clas) {
 		Vector vect = null;
-		
+
 		try {
-			TagMeTagger tagger = (TagMeTagger)Class.forName(clas).newInstance();
-			
+			TagMeTagger tagger = (TagMeTagger) Class.forName(clas)
+					.newInstance();
+
 			vect = tagger.getTags(path);
 		} catch (InstantiationException e) {
 			// TODO Auto-generated catch block
@@ -55,21 +58,23 @@
 			// TODO Auto-generated catch block
 			e.printStackTrace();
 		}
-		
+
 		return vect;
 	}
-	
+
 	public boolean addTag(String user, String path, String clas, String tags) {
 		try {
-			TagMeTagger tagger = (TagMeTagger)Class.forName(clas).newInstance();
-			
-			log.info("tags: "+ tags + "\nspliter: "+TagMeClickListener.TAG_SEP);
+			TagMeTagger tagger = (TagMeTagger) Class.forName(clas)
+					.newInstance();
+
+			log.info("tags: " + tags + "\nspliter: "
+					+ TagMeClickListener.TAG_SEP);
 			String[] tagsTable = tags.split(TagMeClickListener.TAG_SEP);
-			
+
 			for (int i = 0; i < tagsTable.length; i++) {
 				tagger.addTag(user, path, tagsTable[i]);
 			}
-			
+
 			return true;
 		} catch (InstantiationException e) {
 			// TODO Auto-generated catch block
@@ -88,25 +93,48 @@
 
 	public boolean deleteTag(String user, String path, String clas, String tag) {
 
-			try {
-				TagMeTagger tagger = (TagMeTagger)Class.forName(clas).newInstance();
-				
-				tagger.deleteTag(user, path, tag);
-				
-				return true;
-			} catch (InstantiationException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (IllegalAccessException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			} catch (ClassNotFoundException e) {
-				// TODO Auto-generated catch block
-				e.printStackTrace();
-			}
-			
-			return false;
+		try {
+			TagMeTagger tagger = (TagMeTagger) Class.forName(clas)
+					.newInstance();
 
+			tagger.deleteTag(user, path, tag);
+
+			return true;
+		} catch (InstantiationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IllegalAccessException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (ClassNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		return false;
+
 	}
 
+	public Vector getSugestions(String path, String clas) {
+		Vector vect = null;
+
+		try {
+			TagMeTagger tagger = (TagMeTagger) Class.forName(clas)
+					.newInstance();
+
+			vect = tagger.getSuggestions(path);
+		} catch (InstantiationException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (IllegalAccessException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		} catch (ClassNotFoundException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		return vect;
+	}
+
 }

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeClickListener.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeClickListener.java	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeClickListener.java	2006-06-15 00:29:26 UTC (rev 4762)
@@ -29,6 +29,7 @@
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.rpc.ServiceDefTarget;
 import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.CheckBox;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.Label;
 import com.google.gwt.user.client.ui.TextBox;
@@ -51,15 +52,18 @@
 	private Button button;
 
 	private TagMeShowPopupListener parent;
+	
+	private Vector suggestionCheckboxes;
 
 	public TagMeClickListener(String path, String user, String clas,
-			Vector textBoxes, Label info, TagMeShowPopupListener parent) {
+			Vector textBoxes, Label info, Vector suggestionCheckboxes, TagMeShowPopupListener parent) {
 		this.path = path;
 		this.user = user;
 		this.textBoxes = textBoxes;
 		this.clas = clas;
 		this.info = info;
 		this.parent = parent;
+		this.suggestionCheckboxes = suggestionCheckboxes;
 	}
 
 	public void onClick(Widget sender) {
@@ -100,6 +104,18 @@
 				}
 			}
 		}
+		
+		for (int i = 0; i < suggestionCheckboxes.size(); i++) {
+			CheckBox chBox = (CheckBox)suggestionCheckboxes.get(i);
+			
+			if (chBox.isChecked()) {
+				if (tags.length() == 0) {
+					tags = chBox.getText();
+				} else {
+					tags += TAG_SEP + chBox.getText();
+				}
+			}
+		}
 
 		tagging.addTag(user, path, clas, tags, callback);
 

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TagMeShowPopupListener.java	2006-06-15 00:29:26 UTC (rev 4762)
@@ -30,6 +30,7 @@
 import com.google.gwt.user.client.rpc.AsyncCallback;
 import com.google.gwt.user.client.rpc.ServiceDefTarget;
 import com.google.gwt.user.client.ui.Button;
+import com.google.gwt.user.client.ui.CheckBox;
 import com.google.gwt.user.client.ui.ClickListener;
 import com.google.gwt.user.client.ui.DialogBox;
 import com.google.gwt.user.client.ui.FlexTable;
@@ -59,6 +60,10 @@
 
 	private Button saveBtn;
 
+	private FlexTable suggTable;
+	
+	private Vector suggestionCheckboxes;
+
 	public TagMeShowPopupListener(String path, String user, String clas) {
 		this.path = path;
 		this.currentUser = user;
@@ -69,6 +74,42 @@
 		return this;
 	}
 
+	public void refreshSugestions() {
+		suggestionCheckboxes = new Vector();
+		
+		while (suggTable.getRowCount() > 0) {
+			table.removeRow(0);
+		}
+
+		TaggingServiceAsync tagging = (TaggingServiceAsync) GWT
+				.create(TaggingService.class);
+
+		ServiceDefTarget endpoint = (ServiceDefTarget) tagging;
+		endpoint.setServiceEntryPoint("/tagme-servlet/tag/");
+
+		AsyncCallback callback = new AsyncCallback() {
+			public void onSuccess(Object result) {
+				Vector vect = (Vector)result;
+				
+				int rowLen = (int)Math.sqrt(vect.size());
+				
+				for (int i = 0; i < vect.size(); i++) {
+					CheckBox chBox = new CheckBox((String)vect.get(i));
+					suggTable.setWidget(i / rowLen, i % rowLen, chBox);
+					suggestionCheckboxes.add(chBox);
+				}
+			}
+
+			public void onFailure(Throwable caught) {
+				Window.alert("Error ! " + caught.getMessage() + " Throwable: "
+						+ caught);
+			}
+		};
+
+		// call AJAX methos, after that callback is going to be executed
+		tagging.getSugestions(path, clas, callback);
+	}
+
 	public void refreshTags() {
 
 		while (table.getRowCount() > 0) {
@@ -98,10 +139,14 @@
 					String user = to[1];
 					String fullName = to[2];
 					String feed = to[3];
+					String authorFeed = to[4];
 
 					if (!rows.keySet().contains(user)) {
 						rows.put(user, new Integer(rowsNum));
-						table.setHTML(rowsNum++, 0, "<b>" + fullName + "</b>");
+						table
+								.setHTML(rowsNum++, 0, "<b><a href='"
+										+ authorFeed + "' target='_blank' >"
+										+ fullName + "</a></b>");
 					}
 
 					int curRow = ((Integer) rows.get(user)).intValue();
@@ -111,8 +156,8 @@
 						Image im = new Image("/tagme-servlet/images/delete.gif");
 
 						HorizontalPanel hpanel = new HorizontalPanel();
-						hpanel.add(new HTML("<a href='" + feed + "' target='_blank' >" + tag
-								+ "</a>"));
+						hpanel.add(new HTML("<a href='" + feed
+								+ "' target='_blank' >" + tag + "</a>"));
 						hpanel.add(im);
 
 						im.addClickListener(new DeleteTagClickListener(
@@ -123,7 +168,8 @@
 					} else {
 						// just show tag
 						table.setHTML(curRow, table.getCellCount(curRow),
-								"<a href='" + feed + "' target='_blank' >" + tag + "</a>");
+								"<a href='" + feed + "' target='_blank' >"
+										+ tag + "</a>");
 					}
 				}
 			}
@@ -136,6 +182,9 @@
 
 		// call AJAX methos, after that callback is going to be executed
 		tagging.getTags(path, clas, callback);
+		
+		// refresh tags also
+		refreshSugestions();
 	}
 
 	public void onClick(Widget sender) {
@@ -149,21 +198,36 @@
 
 		panel.add(table);
 
+		HorizontalPanel hPanel = new HorizontalPanel();
+		VerticalPanel input = new VerticalPanel();
+		input.add(new Label("Add a Tag:"));
+
+		hPanel.add(input);
+
+		VerticalPanel suggestions = new VerticalPanel();
+		suggTable = new FlexTable();
+		suggestions.add(new Label("Suggestions:"));
+		suggestions.add(suggTable);
+
+		hPanel.add(suggestions);
+
 		Vector textBoxes = new Vector();
 
 		for (int i = 0; i < 3; i++) {
 			TextBox box = new TextBox();
 			textBoxes.add(box);
-			panel.add(box);
+			input.add(box);
 		}
 
+		panel.add(hPanel);
+
 		refreshTags();
 
 		final DialogBox dialog = new DialogBox();
 
 		HorizontalPanel btnPanel = new HorizontalPanel();
 		this.saveBtn = new Button("Save", new TagMeClickListener(path,
-				currentUser, clas, textBoxes, info, this));
+				currentUser, clas, textBoxes, info, suggestionCheckboxes, this));
 		btnPanel.add(saveBtn);
 		btnPanel.add(new Button("Close", new ClickListener() {
 

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingService.java	2006-06-15 00:29:26 UTC (rev 4762)
@@ -44,4 +44,6 @@
 	public boolean addTag(String user, String path, String clas, String tags);
 	
 	public boolean deleteTag(String user, String path, String clas, String tag);
+	
+	public Vector getSugestions(String path, String clas);
 }

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/gwt/client/TaggingServiceAsync.java	2006-06-15 00:29:26 UTC (rev 4762)
@@ -38,4 +38,6 @@
 
 	public void deleteTag(String user, String path, String clas, String tag,
 			AsyncCallback callback);
+
+	public void getSugestions(String path, String clas, AsyncCallback callback);
 }

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/ShotokuTaggingService.java	2006-06-15 00:29:26 UTC (rev 4762)
@@ -45,8 +45,40 @@
 
 	private TagService service = TagTools.getService();
 
-	public String getFeedForTag(String tag, String type) {
-		return service.getFeedLink(FeedType.TAGS, tag, type);
+	public Vector getSuggestions(String path) {
+		Vector<String> sugg = new Vector<String>();
+
+		try {
+			List<Tag> tags = service.getRelatedTags(service.getTags(path));
+
+			if (tags != null) {
+				for (Tag tag : tags) {
+					sugg.add(tag.getName());
+				}
+			}
+			else {
+				//test data
+				sugg.add("Tag");
+				sugg.add("Number");
+				sugg.add("One");
+				sugg.add("Poland");
+				sugg.add("Rocks");
+				sugg.add("Elephant");
+				sugg.add("Bimbom");
+				sugg.add("Tag1");
+				sugg.add("Number2");
+				sugg.add("One3");
+				sugg.add("Poland4");
+				sugg.add("Rocks5");
+				sugg.add("Elephant6");
+				sugg.add("Bimbom7");
+			}
+		} catch (TagGetException e) {
+			// TODO Auto-generated catch block
+			e.printStackTrace();
+		}
+
+		return sugg;
 	}
 
 	public Vector getTags(String path) {
@@ -65,6 +97,9 @@
 						+ tag.getAuthor()
 						+ TagMeClickListener.TAG_SEP
 						+ service.getFeedLink(FeedType.TAGS, tag.getName(),
+								"rss2")
+						+ TagMeClickListener.TAG_SEP
+						+ service.getFeedLink(FeedType.AUTHOR, tag.getAuthor(),
 								"rss2"));
 			}
 

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/forge-tagme/src/java/org/jboss/labs/tagme/services/TagMeTagger.java	2006-06-15 00:29:26 UTC (rev 4762)
@@ -30,5 +30,5 @@
 	
 	public void deleteTag(String user, String path, String tag);
 	
-	public String getFeedForTag(String tag, String type);
+	public Vector getSuggestions(String path);
 }

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java	2006-06-15 00:29:26 UTC (rev 4762)
@@ -22,12 +22,13 @@
 package org.jboss.wiki;
 
 import java.io.File;
+import java.io.FileDescriptor;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.InputStreamReader;
+import java.io.PrintWriter;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -66,6 +67,8 @@
 
 	private static final String propModFileName = "fileMod.properties";
 
+	private static final String CHARSET = "UTF-8";
+
 	private String pathToMediaTrash;
 
 	private String pathToMedia;
@@ -182,7 +185,7 @@
 
 			// harddisk - add new
 			// version
-			Properties pageProps = getPageProps(uidTranslated);
+			Properties pageProps = getPageProps(uid);
 
 			pageProps.setProperty(page.getLastVersion() + ".author", page
 					.getLastAuthor().getName());
@@ -201,12 +204,12 @@
 			File pageOldFile = new File(pathToMedia + "/" + uidTranslated
 					+ ".txt");
 
-			FileWriter pageFileWriter;
-			FileReader pageFileReader;
+			PrintWriter pageFileWriter;
+			InputStreamReader pageFileReader;
 
 			try {
-				pageFileWriter = new FileWriter(pageFile);
-				pageFileReader = new FileReader(pageOldFile);
+				pageFileWriter = new PrintWriter(pageFile, CHARSET);
+				pageFileReader = new InputStreamReader(new FileInputStream(pageOldFile), CHARSET);
 
 				int b;
 
@@ -220,13 +223,14 @@
 
 				pageOldFile.delete();
 
-				pageFileWriter = new FileWriter(pageOldFile);
+				pageFileWriter = new PrintWriter(pageOldFile, CHARSET);
 
 				String pageContent = page.getContent();
 
-				for (int i = 0; i < pageContent.length(); i++) {
+				pageFileWriter.write(pageContent);
+				/*for (int i = 0; i < pageContent.length(); i++) {
 					pageFileWriter.write((int) pageContent.charAt(i));
-				}
+				}*/
 
 				pageFileWriter.close();
 			} catch (FileNotFoundException fnfe) {
@@ -269,14 +273,16 @@
 
 				pageDir.mkdirs();
 
-				FileWriter pageWriter = new FileWriter(new File(pathToMedia
-						+ "/" + uidTranslated + ".txt"));
+				PrintWriter pageWriter = new PrintWriter(new File(pathToMedia
+						+ "/" + uidTranslated + ".txt"), CHARSET);
 
 				String pageContent = page.getContent();
 
-				for (int i = 0; i < pageContent.length(); i++) {
+				pageWriter.write(pageContent);
+				
+				/*for (int i = 0; i < pageContent.length(); i++) {
 					pageWriter.write((int) pageContent.charAt(i));
-				}
+				}*/
 
 				pageWriter.close();
 
@@ -298,21 +304,22 @@
 	public Properties getPageProps(String pageName) {
 		Properties pageProps = new Properties();
 
+		String translatedPageName = FileDSCommons.translateToFileName(pageName);
 		try {
 			FileInputStream fpi = new FileInputStream(new File(pathToMedia
-					+ "/OLD/" + pageName + "/page.properties"));
+					+ "/OLD/" + translatedPageName + "/page.properties"));
 			pageProps.load(fpi);
 			fpi.close();
 		} catch (IOException ioe) {
 			// There is no prop file for some reson - create one.
 
-			File pagePropsFile = new File(pathToMedia + "/OLD/" + pageName);
+			File pagePropsFile = new File(pathToMedia + "/OLD/" + translatedPageName);
 
 			// create dirs
 			pagePropsFile.mkdirs();
 
 			// create file
-			pagePropsFile = new File(pathToMedia + "/OLD/" + pageName
+			pagePropsFile = new File(pathToMedia + "/OLD/" + translatedPageName
 					+ "/page.properties");
 
 			try {
@@ -451,7 +458,7 @@
 				StringBuilder pageContent = new StringBuilder();
 
 				try {
-					FileReader input = new FileReader(pageFile);
+					InputStreamReader input = new InputStreamReader(new FileInputStream(pageFile), CHARSET);
 					// FileInputStream input = new FileInputStream(pageFile);
 
 					int nextChr = input.read();
@@ -556,13 +563,14 @@
 			boolean loadContent, int version) {
 		StringBuilder ret = null;
 
-		File pageFile = new File(pathToMedia + "/OLD/" + uid + "/" + version
+		File pageFile = new File(pathToMedia + "/OLD/" + FileDSCommons.translateToFileName(uid) + "/" + version
 				+ ".txt");
 
 		if (loadContent) {
 			try {
-				FileReader input = new FileReader(pageFile);
-
+				
+				InputStreamReader input = new InputStreamReader(new FileInputStream(pageFile), CHARSET);
+				
 				int nextChr = input.read();
 
 				ret = new StringBuilder();
@@ -837,7 +845,9 @@
 			return new Properties();
 		}
 
-		File propsFile = new File(pathToMedia + "/OLD/" + uid
+		String uidTranslated = FileDSCommons.translateToFileName(uid);
+		
+		File propsFile = new File(pathToMedia + "/OLD/" + uidTranslated
 				+ "/metadata.properties");
 
 		if (!propsFile.exists()) {

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java	2006-06-15 00:29:26 UTC (rev 4762)
@@ -82,7 +82,7 @@
 			try {
 				queue = (Queue) context.lookup("queue/wikiNotifications");
 				QueueConnectionFactory factory = (QueueConnectionFactory) context
-						.lookup("ConnectionFactory");
+						.lookup("java:/ConnectionFactory");
 				sess = factory.createQueueConnection().createQueueSession(
 						false, QueueSession.AUTO_ACKNOWLEDGE);
 

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/META-INF/MANIFEST.MF	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/META-INF/MANIFEST.MF	2006-06-15 00:29:26 UTC (rev 4762)
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 Ant-Version: Apache Ant 1.6.5
-Created-By: 1.4.2_11-b06 (Sun Microsystems Inc.)
+Created-By: 1.4.2-66 ("Apple Computer, Inc.")
 

Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/ehcache.xml (from rev 4761, labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/ehcache.xml)

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/hibernate.cfg.xml	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/instance/hibernate.cfg.xml	2006-06-15 00:29:26 UTC (rev 4762)
@@ -8,6 +8,7 @@
       <property name="show_sql">false</property>
       <property name="cache.use_second_level_cache">true</property>
       <property name="cache.use_query_cache">true</property>
+      <property name="cache.provider_configuration_file_resource_path">conf/hibernate/instance/ehcache.xml</property>
 
       <!--
          | Uncomment in clustered mode : use transactional replicated cache

Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/ehcache.xml (from rev 4761, labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/ehcache.xml)

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/hibernate.cfg.xml	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/portal/hibernate.cfg.xml	2006-06-15 00:29:26 UTC (rev 4762)
@@ -8,6 +8,7 @@
       <property name="show_sql">false</property>
       <property name="cache.use_second_level_cache">true</property>
       <property name="cache.use_query_cache">true</property>
+      <property name="cache.provider_configuration_file_resource_path">conf/hibernate/portal/ehcache.xml</property>
 
       <!--
          | Uncomment in clustered mode : use transactional replicated cache

Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/ehcache.xml (from rev 4761, labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/ehcache.xml)

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/hibernate.cfg.xml	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/security/hibernate.cfg.xml	2006-06-15 00:29:26 UTC (rev 4762)
@@ -11,6 +11,7 @@
       <property name="transaction.auto_close_session">false</property>
       <property name="transaction.flush_before_completion">false</property>
       <property name="cache.provider_class">org.hibernate.cache.EhCacheProvider</property>
+      <property name="cache.provider_configuration_file_resource_path">conf/hibernate/security/ehcache.xml</property>
 
       <!-- Force the dialect instead of using autodetection -->
       <!--

Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/ehcache.xml (from rev 4761, labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/ehcache.xml)

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/hibernate.cfg.xml
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/hibernate.cfg.xml	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/conf/hibernate/user/hibernate.cfg.xml	2006-06-15 00:29:26 UTC (rev 4762)
@@ -8,6 +8,7 @@
       <property name="show_sql">false</property>
       <property name="cache.use_second_level_cache">true</property>
       <property name="cache.use_query_cache">true</property>
+      <property name="cache.provider_configuration_file_resource_path">conf/hibernate/user/ehcache.xml</property>
 
       <!--
          | Uncomment in clustered mode : use transactional replicated cache

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/ehcache.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-bridge-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-common-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-core-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-faces-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-format-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-portlet-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-security-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-server-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portal-theme-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/lib/portlet-api-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/MANIFEST.MF	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/META-INF/MANIFEST.MF	2006-06-15 00:29:26 UTC (rev 4762)
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 Ant-Version: Apache Ant 1.6.5
-Created-By: 1.4.2_11-b06 (Sun Microsystems Inc.)
+Created-By: 1.4.2-66 ("Apple Computer, Inc.")
 

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.sar/portal-cms-lib.jar
===================================================================
(Binary files differ)

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/META-INF/MANIFEST.MF	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-cms.war/META-INF/MANIFEST.MF	2006-06-15 00:29:26 UTC (rev 4762)
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 Ant-Version: Apache Ant 1.6.5
-Created-By: 1.4.2_11-b06 (Sun Microsystems Inc.)
+Created-By: 1.4.2-66 ("Apple Computer, Inc.")
 

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/META-INF/MANIFEST.MF	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-core.war/META-INF/MANIFEST.MF	2006-06-15 00:29:26 UTC (rev 4762)
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 Ant-Version: Apache Ant 1.6.5
-Created-By: 1.4.2_11-b06 (Sun Microsystems Inc.)
+Created-By: 1.4.2-66 ("Apple Computer, Inc.")
 

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/META-INF/MANIFEST.MF	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/META-INF/MANIFEST.MF	2006-06-15 00:29:26 UTC (rev 4762)
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 Ant-Version: Apache Ant 1.6.5
-Created-By: 1.4.2_11-b06 (Sun Microsystems Inc.)
+Created-By: 1.4.2-66 ("Apple Computer, Inc.")
 

Copied: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/web.xml (from rev 4761, labs/jbosslabs/trunk/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-samples.war/WEB-INF/web.xml)

Modified: labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/META-INF/MANIFEST.MF
===================================================================
--- labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/META-INF/MANIFEST.MF	2006-06-14 23:20:49 UTC (rev 4761)
+++ labs/jbosslabs/branches/qa/jbosslabs/portal-extensions/portal-binaries/to-copy/jboss-portal.sar/portal-server.war/META-INF/MANIFEST.MF	2006-06-15 00:29:26 UTC (rev 4762)
@@ -1,4 +1,4 @@
 Manifest-Version: 1.0
 Ant-Version: Apache Ant 1.6.5
-Created-By: 1.4.2_11-b06 (Sun Microsystems Inc.)
+Created-By: 1.4.2-66 ("Apple Computer, Inc.")

[Jboss-svn-commits] JBL Code SVN: r4761 - in labs/jbosslabs/trunk/portal-extensions: forge-common/src/java/org/jboss/forge/common/projects forge-status/src/java/org/jboss/forge/status/tools jbosswiki/wiki-common/src/java/org/jboss/wiki

From: <jbo...@li...> - 2006-06-14 23:20:55

Author: dam...@jb...
Date: 2006-06-14 19:20:49 -0400 (Wed, 14 Jun 2006)
New Revision: 4761

Modified:
   labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java
Log:
Making MDBs use local connection factory.

Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java	2006-06-14 21:23:50 UTC (rev 4760)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/DownloadCountersDB.java	2006-06-14 23:20:49 UTC (rev 4761)
@@ -133,7 +133,7 @@
                 Queue queue = null;
                 queue = (Queue) ctx.lookup("queue/jblab_counters");
                 QueueConnectionFactory factory =
-                    (QueueConnectionFactory) ctx.lookup("ConnectionFactory");
+                    (QueueConnectionFactory) ctx.lookup("java:/ConnectionFactory");
                 sess =factory.createQueueConnection().createQueueSession(false,
                                                    QueueSession.AUTO_ACKNOWLEDGE);
                 if (sess != null)

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java	2006-06-14 21:23:50 UTC (rev 4760)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java	2006-06-14 23:20:49 UTC (rev 4761)
@@ -173,7 +173,7 @@
 		
 	    queue = (Queue) context.lookup(Constants.QUEUE_NAME);
 	    QueueConnectionFactory factory =
-	        (QueueConnectionFactory) context.lookup("ConnectionFactory");
+	        (QueueConnectionFactory) context.lookup("java:/ConnectionFactory");
 	    connection = factory.createQueueConnection();
 	    session = connection.createQueueSession(false,
 	            QueueSession.AUTO_ACKNOWLEDGE);

Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java	2006-06-14 21:23:50 UTC (rev 4760)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/WikiCommon.java	2006-06-14 23:20:49 UTC (rev 4761)
@@ -82,7 +82,7 @@
 			try {
 				queue = (Queue) context.lookup("queue/wikiNotifications");
 				QueueConnectionFactory factory = (QueueConnectionFactory) context
-						.lookup("ConnectionFactory");
+						.lookup("java:/ConnectionFactory");
 				sess = factory.createQueueConnection().createQueueSession(
 						false, QueueSession.AUTO_ACKNOWLEDGE);

[Jboss-svn-commits] JBL Code SVN: r4760 - labs/jbossweb/trunk/src/share/native/build/patch

From: <jbo...@li...> - 2006-06-14 21:23:55

Author: jfr...@jb...
Date: 2006-06-14 17:23:50 -0400 (Wed, 14 Jun 2006)
New Revision: 4760

Added:
   labs/jbossweb/trunk/src/share/native/build/patch/freetype-2.1.9.patch
Log:
Allow ttf example to work on Solaris.


Added: labs/jbossweb/trunk/src/share/native/build/patch/freetype-2.1.9.patch
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/patch/freetype-2.1.9.patch	2006-06-14 08:51:39 UTC (rev 4759)
+++ labs/jbossweb/trunk/src/share/native/build/patch/freetype-2.1.9.patch	2006-06-14 21:23:50 UTC (rev 4760)
@@ -0,0 +1,20 @@
+--- freetype-2.1.9/include/freetype/config/ftoption.h	Sun Apr 25 16:15:09 2004
++++ freetype-2.1.9/include/freetype/config/ftoption.h	Wed Jun 14 15:53:38 2006
+@@ -436,7 +436,7 @@
+   /*   Do not #undef this macro here, since the build system might         */
+   /*   define it for certain configurations only.                          */
+   /*                                                                       */
+-/* #define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER */
++#define  TT_CONFIG_OPTION_BYTECODE_INTERPRETER
+ 
+ 
+   /*************************************************************************/
+@@ -448,7 +448,7 @@
+   /* FT_PARAM_TAG_UNPATENTED_HINTING; or when the debug hook               */
+   /* FT_DEBUG_HOOK_UNPATENTED_HINTING is globally actived                  */
+   /*                                                                       */
+-#define TT_CONFIG_OPTION_UNPATENTED_HINTING
++/* #define TT_CONFIG_OPTION_UNPATENTED_HINTING */
+ 
+ 
+   /*************************************************************************/

[Jboss-svn-commits] JBL Code SVN: r4759 - labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki

From: <jbo...@li...> - 2006-06-14 08:51:45

Author: szimano
Date: 2006-06-14 04:51:39 -0400 (Wed, 14 Jun 2006)
New Revision: 4759

Modified:
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
Log:
utf-8 fixes


Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java	2006-06-14 03:06:31 UTC (rev 4758)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java	2006-06-14 08:51:39 UTC (rev 4759)
@@ -845,7 +845,9 @@
 			return new Properties();
 		}
 
-		File propsFile = new File(pathToMedia + "/OLD/" + uid
+		String uidTranslated = FileDSCommons.translateToFileName(uid);
+		
+		File propsFile = new File(pathToMedia + "/OLD/" + uidTranslated
 				+ "/metadata.properties");
 
 		if (!propsFile.exists()) {

[Jboss-svn-commits] JBL Code SVN: r4758 - in labs/trailblazers/trunk/EJB3: . docs/services/interceptor lib src/trail/injection src/trail/interceptor

From: <jbo...@li...> - 2006-06-14 03:06:46

Author: mic...@jb...
Date: 2006-06-13 23:06:31 -0400 (Tue, 13 Jun 2006)
New Revision: 4758

Modified:
   labs/trailblazers/trunk/EJB3/EEE.iws
   labs/trailblazers/trunk/EJB3/docs/services/interceptor/index.html
   labs/trailblazers/trunk/EJB3/lib/jboss-annotations-ejb3.jar
   labs/trailblazers/trunk/EJB3/lib/jboss-ejb3.jar
   labs/trailblazers/trunk/EJB3/lib/jboss-ejb3x.jar
   labs/trailblazers/trunk/EJB3/src/trail/injection/CalculatorMDB.java
   labs/trailblazers/trunk/EJB3/src/trail/interceptor/Tracer.java
Log:
Upgrade to RC7


Modified: labs/trailblazers/trunk/EJB3/EEE.iws
===================================================================
--- labs/trailblazers/trunk/EJB3/EEE.iws	2006-06-13 21:41:51 UTC (rev 4757)
+++ labs/trailblazers/trunk/EJB3/EEE.iws	2006-06-14 03:06:31 UTC (rev 4758)
@@ -134,93 +134,93 @@
   </component>
   <component name="FileEditorManager">
     <leaf>
-      <file leaf-file-name="index.html" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/docs/services/interceptor/index.html">
+      <file leaf-file-name="CalculatorBean.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/trail/mdb/CalculatorBean.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="239" column="7" selection-start="7734" selection-end="7734" vertical-scroll-proportion="0.6621622">
+            <state line="14" column="54" selection-start="374" selection-end="400" vertical-scroll-proportion="0.025525525">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Tracer.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/trail/interceptor/Tracer.java">
+      <file leaf-file-name="CalculationRecord.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/trail/injection/CalculationRecord.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="3" column="26" selection-start="74" selection-end="74" vertical-scroll-proportion="0.076576576">
-              <folding>
-                <element signature="imports" expanded="true" />
-              </folding>
+            <state line="4" column="13" selection-start="67" selection-end="67" vertical-scroll-proportion="0.09985316">
+              <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CalculatorMBean.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/trail/jmx/CalculatorMBean.java">
+      <file leaf-file-name="CalculatorMDB.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/trail/injection/CalculatorMDB.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="7" column="13" selection-start="198" selection-end="198" vertical-scroll-proportion="0.15315315">
-              <folding />
+            <state line="3" column="19" selection-start="65" selection-end="65" vertical-scroll-proportion="0.076576576">
+              <folding>
+                <element signature="imports" expanded="true" />
+              </folding>
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CalculationRecord.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/trail/mdb/CalculationRecord.java">
+      <file leaf-file-name="InjectionRec.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/trail/injection/InjectionRec.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="4" column="13" selection-start="61" selection-end="61" vertical-scroll-proportion="0.1021021">
+            <state line="7" column="13" selection-start="135" selection-end="135" vertical-scroll-proportion="0.14977974">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CalculatorBean.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/trail/mdb/CalculatorBean.java">
+      <file leaf-file-name="RecordManager.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/trail/injection/RecordManager.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="14" column="13" selection-start="359" selection-end="359" vertical-scroll-proportion="0.2807808">
+            <state line="2" column="17" selection-start="43" selection-end="43" vertical-scroll-proportion="0.04992658">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="RecordManager.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/trail/mdb/RecordManager.java">
+      <file leaf-file-name="RecordManagerBean.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/trail/injection/RecordManagerBean.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="5" column="13" selection-start="89" selection-end="89" vertical-scroll-proportion="0.1021021">
+            <state line="26" column="26" selection-start="645" selection-end="645" vertical-scroll-proportion="0.4743025">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="CalculationRecord.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/trail/mdpojo/CalculationRecord.java">
+      <file leaf-file-name="Calculator.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/trail/interceptor/Calculator.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="4" column="13" selection-start="64" selection-end="64" vertical-scroll-proportion="0.1021021">
+            <state line="4" column="17" selection-start="74" selection-end="74" vertical-scroll-proportion="0.1021021">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Calculator.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/trail/mdpojo/Calculator.java">
+      <file leaf-file-name="InterceptorCalculator.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/trail/interceptor/InterceptorCalculator.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="5" column="17" selection-start="93" selection-end="93" vertical-scroll-proportion="0.12481645">
+            <state line="11" column="4" selection-start="205" selection-end="205" vertical-scroll-proportion="0.2042042">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="MdpojoCalculator.java" pinned="false" current="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/src/trail/mdpojo/MdpojoCalculator.java">
+      <file leaf-file-name="Tracer.java" pinned="false" current="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/src/trail/interceptor/Tracer.java">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="14" column="13" selection-start="349" selection-end="349" vertical-scroll-proportion="0.2807808">
+            <state line="14" column="36" selection-start="379" selection-end="379" vertical-scroll-proportion="0.33183184">
               <folding />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="RecordManager.java" pinned="false" current="true" current-in-tab="true">
-        <entry file="file://$PROJECT_DIR$/src/trail/mdpojo/RecordManager.java">
+      <file leaf-file-name="index.html" pinned="false" current="true" current-in-tab="true">
+        <entry file="file://$PROJECT_DIR$/docs/services/interceptor/index.html">
           <provider selected="true" editor-type-id="text-editor">
-            <state line="5" column="13" selection-start="92" selection-end="92" vertical-scroll-proportion="0.1021021">
+            <state line="224" column="35" selection-start="7348" selection-end="7348" vertical-scroll-proportion="5.7177176">
               <folding />
             </state>
           </provider>
@@ -516,6 +516,32 @@
         <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
       </PATH_ELEMENT>
       <PATH_ELEMENT>
+        <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/trail/injection" />
+        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+      </PATH_ELEMENT>
+    </PATH>
+    <PATH>
+      <PATH_ELEMENT>
+        <option name="myItemId" value="EEE.ipr" />
+        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewProjectNode" />
+      </PATH_ELEMENT>
+      <PATH_ELEMENT>
+        <option name="myItemId" value="EEE" />
+        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.ProjectViewModuleNode" />
+      </PATH_ELEMENT>
+      <PATH_ELEMENT>
+        <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$" />
+        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+      </PATH_ELEMENT>
+      <PATH_ELEMENT>
+        <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src" />
+        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+      </PATH_ELEMENT>
+      <PATH_ELEMENT>
+        <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/trail" />
+        <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
+      </PATH_ELEMENT>
+      <PATH_ELEMENT>
         <option name="myItemId" value="PsiDirectory:$PROJECT_DIR$/src/trail/apptrans" />
         <option name="myItemType" value="com.intellij.ide.projectView.impl.nodes.PsiDirectoryNode" />
       </PATH_ELEMENT>
@@ -674,15 +700,6 @@
       <option name="HOST" value="localhost" />
       <option name="PORT" value="5005" />
     </configuration>
-    <configuration selected="false" default="true" type="Application" factoryName="Application">
-      <option name="MAIN_CLASS_NAME" />
-      <option name="VM_PARAMETERS" />
-      <option name="PROGRAM_PARAMETERS" />
-      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
-      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
-      <option name="ALTERNATIVE_JRE_PATH" />
-      <module name="" />
-    </configuration>
     <configuration selected="false" default="true" type="JUnit" factoryName="JUnit">
       <module name="" />
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
@@ -711,6 +728,15 @@
       <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
       <option name="ALTERNATIVE_JRE_PATH" />
     </configuration>
+    <configuration selected="false" default="true" type="Application" factoryName="Application">
+      <option name="MAIN_CLASS_NAME" />
+      <option name="VM_PARAMETERS" />
+      <option name="PROGRAM_PARAMETERS" />
+      <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+      <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+      <option name="ALTERNATIVE_JRE_PATH" />
+      <module name="" />
+    </configuration>
   </component>
   <component name="SelectInManager" />
   <component name="StarteamConfiguration">
@@ -755,12 +781,12 @@
     </todo-panel>
   </component>
   <component name="ToolWindowManager">
-    <frame x="33" y="23" width="1099" height="828" extended-state="0" />
+    <frame x="105" y="24" width="1099" height="828" extended-state="0" />
     <editor active="true" />
     <layout>
       <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
       <window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33006993" order="7" />
-      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.25594673" order="0" />
+      <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="true" weight="0.26165557" order="0" />
       <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.32968536" order="1" />
       <window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.25" order="1" />
       <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="docked" type="docked" visible="false" weight="0.33" order="8" />
@@ -846,111 +872,109 @@
     <option name="FILTER_TARGETS" value="false" />
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/dd2/web/web.xml">
+    <entry file="file://$PROJECT_DIR$/src/trail/mdpojo/CalculationRecord.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+        <state line="4" column="13" selection-start="64" selection-end="64" vertical-scroll-proportion="0.0">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/dd/web/jboss-web.xml">
+    <entry file="file://$PROJECT_DIR$/src/trail/mdpojo/Calculator.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="0" column="0" selection-start="0" selection-end="0" vertical-scroll-proportion="0.0">
+        <state line="5" column="17" selection-start="93" selection-end="93" vertical-scroll-proportion="0.12481645">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/trail/lifecycle/SessionRecord.java">
+    <entry file="file://$PROJECT_DIR$/src/trail/mdpojo/MdpojoCalculator.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="2" column="13" selection-start="39" selection-end="39" vertical-scroll-proportion="0.04992658">
+        <state line="14" column="13" selection-start="349" selection-end="349" vertical-scroll-proportion="0.2807808">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/trail/apptrans/ApptransCalculator.java">
+    <entry file="file://$PROJECT_DIR$/src/trail/mdpojo/RecordManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="46" column="62" selection-start="1234" selection-end="1234" vertical-scroll-proportion="0.37237236">
+        <state line="5" column="13" selection-start="92" selection-end="92" vertical-scroll-proportion="0.08858859">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/trail/interceptor/InterceptorCalculator.java">
+    <entry file="file://$PROJECT_DIR$/src/trail/mdb/CalculationRecord.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="3" column="26" selection-start="74" selection-end="74" vertical-scroll-proportion="0.076576576">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state line="4" column="13" selection-start="61" selection-end="61" vertical-scroll-proportion="0.1021021">
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/docs/services/interceptor/index.html">
+    <entry file="file://$PROJECT_DIR$/src/trail/mdb/CalculatorBean.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="239" column="7" selection-start="7734" selection-end="7734" vertical-scroll-proportion="0.6621622">
+        <state line="14" column="54" selection-start="374" selection-end="400" vertical-scroll-proportion="0.025525525">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/trail/interceptor/Tracer.java">
+    <entry file="file://$PROJECT_DIR$/src/trail/injection/CalculationRecord.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="3" column="26" selection-start="74" selection-end="74" vertical-scroll-proportion="0.076576576">
-          <folding>
-            <element signature="imports" expanded="true" />
-          </folding>
+        <state line="4" column="13" selection-start="67" selection-end="67" vertical-scroll-proportion="0.09985316">
+          <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/trail/jmx/CalculatorMBean.java">
+    <entry file="file://$PROJECT_DIR$/src/trail/injection/CalculatorMDB.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="7" column="13" selection-start="198" selection-end="198" vertical-scroll-proportion="0.15315315">
-          <folding />
+        <state line="3" column="19" selection-start="65" selection-end="65" vertical-scroll-proportion="0.076576576">
+          <folding>
+            <element signature="imports" expanded="true" />
+          </folding>
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/trail/mdb/CalculationRecord.java">
+    <entry file="file://$PROJECT_DIR$/src/trail/injection/InjectionRec.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="4" column="13" selection-start="61" selection-end="61" vertical-scroll-proportion="0.1021021">
+        <state line="7" column="13" selection-start="135" selection-end="135" vertical-scroll-proportion="0.14977974">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/trail/mdb/CalculatorBean.java">
+    <entry file="file://$PROJECT_DIR$/src/trail/injection/RecordManager.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="14" column="13" selection-start="359" selection-end="359" vertical-scroll-proportion="0.2807808">
+        <state line="2" column="17" selection-start="43" selection-end="43" vertical-scroll-proportion="0.04992658">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/trail/mdb/RecordManager.java">
+    <entry file="file://$PROJECT_DIR$/src/trail/injection/RecordManagerBean.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="13" selection-start="89" selection-end="89" vertical-scroll-proportion="0.1021021">
+        <state line="26" column="26" selection-start="645" selection-end="645" vertical-scroll-proportion="0.4743025">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/trail/mdpojo/CalculationRecord.java">
+    <entry file="file://$PROJECT_DIR$/src/trail/interceptor/Calculator.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="4" column="13" selection-start="64" selection-end="64" vertical-scroll-proportion="0.1021021">
+        <state line="4" column="17" selection-start="74" selection-end="74" vertical-scroll-proportion="0.1021021">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/trail/mdpojo/Calculator.java">
+    <entry file="file://$PROJECT_DIR$/src/trail/interceptor/InterceptorCalculator.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="17" selection-start="93" selection-end="93" vertical-scroll-proportion="0.12481645">
+        <state line="11" column="4" selection-start="205" selection-end="205" vertical-scroll-proportion="0.2042042">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/trail/mdpojo/MdpojoCalculator.java">
+    <entry file="file://$PROJECT_DIR$/src/trail/interceptor/Tracer.java">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="14" column="13" selection-start="349" selection-end="349" vertical-scroll-proportion="0.2807808">
+        <state line="14" column="36" selection-start="379" selection-end="379" vertical-scroll-proportion="0.33183184">
           <folding />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/src/trail/mdpojo/RecordManager.java">
+    <entry file="file://$PROJECT_DIR$/docs/services/interceptor/index.html">
       <provider selected="true" editor-type-id="text-editor">
-        <state line="5" column="13" selection-start="92" selection-end="92" vertical-scroll-proportion="0.1021021">
+        <state line="224" column="35" selection-start="7348" selection-end="7348" vertical-scroll-proportion="5.7177176">
           <folding />
         </state>
       </provider>

Modified: labs/trailblazers/trunk/EJB3/docs/services/interceptor/index.html
===================================================================
--- labs/trailblazers/trunk/EJB3/docs/services/interceptor/index.html	2006-06-13 21:41:51 UTC (rev 4757)
+++ labs/trailblazers/trunk/EJB3/docs/services/interceptor/index.html	2006-06-14 03:06:31 UTC (rev 4758)
@@ -66,9 +66,9 @@
 <font size="2">
 
 <p>The runtime services, such as transaction and security services, are applied to the bean objects at the method invocation time. Under the hood, those services are often implemented as interceptor methods managed by the container, which run before and after the target method invocation to check for service actions (e.g., to commit a transaction or throw a security exception).</p>
-
-<p>EJB 3.0 allows developers to write custom interceptors for EJB methods. That essentially gives you an extensible container. You can develop, reuse and ship your own services. Or, you can even re-implement the transaction and security services to override the container's default services offering. In this trail, we will discuss how EJB 3.0 interceptor works.</p>
 
+<p>EJB 3.0 allows developers to write custom interceptors for EJB methods. That essentially gives you an extensible container. You can develop, reuse and ship your own services. Or, you can even re-implement the transaction and security services to override the container's default services offering. In this trail, we will discuss how EJB 3.0 interceptor works.</p>
+
 </font>
 </td>
 </tr>
@@ -92,11 +92,11 @@
 </tr>
 <tr>
 <td><img width="37" border="0" src="../../images/transparent.gif"></td>
-<td class="description" width="500">
-<font size="2">
-
-<p>The sample application in this trail showcases two custom interceptors I developed for the session-based investment calculator. One interceptor limits the number of historic records to four. That is, if you click on the "calculate" button multiple times, you will only see up to 4 most recent calculation records below the calculator form. The other interceptor provides the trace and execution time for each bean method involved in the calculation. The trace is displayed at the bottom of the page.</p>
+<td class="description" width="500">
+<font size="2">
 
+<p>The sample application in this trail showcases two custom interceptors I developed for the session-based investment calculator. One interceptor limits the number of historic records to four. That is, if you click on the "calculate" button multiple times, you will only see up to 4 most recent calculation records below the calculator form. The other interceptor provides the trace and execution time for each bean method involved in the calculation. The trace is displayed at the bottom of the page.</p>
+
 <p><center>
 <FORM>
 <INPUT type="button" value="Try the calculator" onClick="window.open('calculator.jsp','calculator','width=400,height=500')">
@@ -129,30 +129,30 @@
 <td class="description" width="500">
 <font size="2">
 
-<p>You can place a custom interceptor method inside the bean class. The method must be annotated with the <code>@AroundInvoke</code> tag and it is called by the container before any other business method in the bean object is invoked. The container passes the current invocation context to the interceptor method as the <code>ctx</code> object. From the invocation context, you can figure out the current bean object and the target method intercepted by this interceptor. In the following example, the interceptor method inspects whether there are more than 4 cached records in this session. If so, it erases the earliest record to make room for the new calculation record. The <code>ctx.proceed()</code> statement at the end of the method recursively instructs the runtime to move on to the next interceptor. If there is no more interceptors, the target method is executed.</p>
-
-<pre><code>
-@Stateful
-public class InterceptorCalculator implements Calculator, Serializable {
-
-  // ... ...
-  
-  @AroundInvoke
-  public Object limitStateSize (InvocationContext ctx)
-                                      throws Exception {
-
-    // Remove the earliest entry when the history
-    // list gets too long
-    if (starts.size() > 4) {
-      starts.remove (0);
-      ends.remove (0);
-      growthrates.remove (0);
-      savings.remove (0);
-      results.remove (0);
-    }
-    return ctx.proceed();
-  }
-}
+<p>You can place a custom interceptor method inside the bean class. The method must be annotated with the <code>@AroundInvoke</code> tag and it is called by the container before any other business method in the bean object is invoked. The container passes the current invocation context to the interceptor method as the <code>ctx</code> object. From the invocation context, you can figure out the current bean object and the target method intercepted by this interceptor. In the following example, the interceptor method inspects whether there are more than 4 cached records in this session. If so, it erases the earliest record to make room for the new calculation record. The <code>ctx.proceed()</code> statement at the end of the method recursively instructs the runtime to move on to the next interceptor. If there is no more interceptors, the target method is executed.</p>
+
+<pre><code>
+@Stateful
+public class InterceptorCalculator implements Calculator, Serializable {
+
+  // ... ...
+  
+  @AroundInvoke
+  public Object limitStateSize (InvocationContext ctx)
+                                      throws Exception {
+
+    // Remove the earliest entry when the history
+    // list gets too long
+    if (starts.size() > 4) {
+      starts.remove (0);
+      ends.remove (0);
+      growthrates.remove (0);
+      savings.remove (0);
+      results.remove (0);
+    }
+    return ctx.proceed();
+  }
+}
 </code></pre>
 
 </font>
@@ -181,48 +181,48 @@
 <td class="description" width="500">
 <font size="2">
 
-<p>Another way to define interceptors is to put the interceptor method in a separate class and then annotate the target bean class with the <code>@Interceptor</code> tag. Here is an interceptor class that logs the call trace and execution time of all the method invocation in its target bean object. Recall that the <code>ctx.proceed()</code> call in the interceptor recursively invokes the next interceptor and the target method. Hence, the code in the <code>finally</code> is called after the target and downstream interceptors are all returned.</p>
-
-<pre><code>
-public class Tracer {
-
-  @AroundInvoke
-  public Object log (InvocationContext ctx)
-                            throws Exception {
-
-    String className = ctx.getBean().getClass().getName();
-    String methodName = ctx.getMethod().getName();
-    String target = className + "." + methodName + "()";
-
-    long start = System.currentTimeMillis();
-    System.out.println ("Invoking " + target);
-    try {
-      return ctx.proceed();
-    } catch(Exception e) {
-      throw e;
-    } finally {
-      System.out.println("Exiting " + target);
-      cal.setTrace(cal.getTrace() + "<br/>" +
-                   "Exiting " + target);
-      long time = System.currentTimeMillis() - start;
-      System.out.println("This method takes " +
-                          time + "ms to execute");
-    }
-  }
-}
-</code></pre>
-
-<p>Here is the <code>@Interceptor</code> annotation on the bean class.</p>
-
-<pre><code>
-@Stateful
-@Interceptors (Tracer.class)
-public class InterceptorCalculator implements Calculator, Serializable {
-
-  // ... ...
-}
-</code></pre>
-
+<p>Another way to define interceptors is to put the interceptor method in a separate class and then annotate the target bean class with the <code>@Interceptor</code> tag. Here is an interceptor class that logs the call trace and execution time of all the method invocation in its target bean object. Recall that the <code>ctx.proceed()</code> call in the interceptor recursively invokes the next interceptor and the target method. Hence, the code in the <code>finally</code> is called after the target and downstream interceptors are all returned.</p>
+
+<pre><code>
+public class Tracer {
+
+  @AroundInvoke
+  public Object log (InvocationContext ctx)
+                            throws Exception {
+
+    String className = ctx.getTarget().getClass().getName();
+    String methodName = ctx.getMethod().getName();
+    String target = className + "." + methodName + "()";
+
+    long start = System.currentTimeMillis();
+    System.out.println ("Invoking " + target);
+    try {
+      return ctx.proceed();
+    } catch(Exception e) {
+      throw e;
+    } finally {
+      System.out.println("Exiting " + target);
+      cal.setTrace(cal.getTrace() + "<br/>" +
+                   "Exiting " + target);
+      long time = System.currentTimeMillis() - start;
+      System.out.println("This method takes " +
+                          time + "ms to execute");
+    }
+  }
+}
+</code></pre>
+
+<p>Here is the <code>@Interceptor</code> annotation on the bean class.</p>
+
+<pre><code>
+@Stateful
+@Interceptors (Tracer.class)
+public class InterceptorCalculator implements Calculator, Serializable {
+
+  // ... ...
+}
+</code></pre>
+
 <p> You can also use the <code>@Interceptors</code> annotation to specify multiple interceptor classes for the bean. Those interceptors are invoked in the order they appear on the annotation's attribute array. The interceptor method inside the bean class is invoked the last.</p>
 
 </font>
@@ -248,22 +248,22 @@
 </tr>
 <tr>
 <td><img width="37" border="0" src="../../images/transparent.gif"></td>
-<td class="description" width="500">
-<font size="2">
+<td class="description" width="500">
+<font size="2">
 
-<p>Server</p>
-
-<ul>
-    <li><a href="code/Calculator.java.html">Calculator.java</a>: The session bean interface</li>
-    <li><a href="code/InterceptorCalculator.java.html">InterceptorCalculatorBean.java</a>: The session bean with the history cache size limit interceptor method</li>
-    <li><a href="code/Tracer.java.html">Tracer.java</a>: The interceptor class for the logging and tracing interceptor</li>
-</ul>
-
+<p>Server</p>
+
+<ul>
+    <li><a href="code/Calculator.java.html">Calculator.java</a>: The session bean interface</li>
+    <li><a href="code/InterceptorCalculator.java.html">InterceptorCalculatorBean.java</a>: The session bean with the history cache size limit interceptor method</li>
+    <li><a href="code/Tracer.java.html">Tracer.java</a>: The interceptor class for the logging and tracing interceptor</li>
+</ul>
+
 <p>Client</p>
-
-<ul>
-    <li><a href="code/calculator.jsp.html">calculator.jsp</a>: The JSP user interface</li>
-</ul>
+
+<ul>
+    <li><a href="code/calculator.jsp.html">calculator.jsp</a>: The JSP user interface</li>
+</ul>
 </font>
 </td>
 </tr>

Modified: labs/trailblazers/trunk/EJB3/lib/jboss-annotations-ejb3.jar
===================================================================
(Binary files differ)

Modified: labs/trailblazers/trunk/EJB3/lib/jboss-ejb3.jar
===================================================================
(Binary files differ)

Modified: labs/trailblazers/trunk/EJB3/lib/jboss-ejb3x.jar
===================================================================
(Binary files differ)

Modified: labs/trailblazers/trunk/EJB3/src/trail/injection/CalculatorMDB.java
===================================================================
--- labs/trailblazers/trunk/EJB3/src/trail/injection/CalculatorMDB.java	2006-06-13 21:41:51 UTC (rev 4757)
+++ labs/trailblazers/trunk/EJB3/src/trail/injection/CalculatorMDB.java	2006-06-14 03:06:31 UTC (rev 4758)
@@ -2,7 +2,6 @@
 
 import javax.ejb.*;
 import javax.jms.*;
-import javax.annotation.*;
 import java.util.StringTokenizer;
 import trail.slsb.*;
 

Modified: labs/trailblazers/trunk/EJB3/src/trail/interceptor/Tracer.java
===================================================================
--- labs/trailblazers/trunk/EJB3/src/trail/interceptor/Tracer.java	2006-06-13 21:41:51 UTC (rev 4757)
+++ labs/trailblazers/trunk/EJB3/src/trail/interceptor/Tracer.java	2006-06-14 03:06:31 UTC (rev 4758)
@@ -10,8 +10,8 @@
   public Object log (InvocationContext ctx)
                             throws Exception {
 
-    InterceptorCalculator cal = (InterceptorCalculator) ctx.getBean();
-    String className = ctx.getBean().getClass().getName();
+    InterceptorCalculator cal = (InterceptorCalculator) ctx.getTarget();
+    String className = ctx.getTarget().getClass().getName();
     String methodName = ctx.getMethod().getName();
     String target = className + "." + methodName + "()";

[Jboss-svn-commits] JBL Code SVN: r4757 - labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples

From: <jbo...@li...> - 2006-06-13 21:41:54

Author: mar...@jb...
Date: 2006-06-13 17:41:51 -0400 (Tue, 13 Jun 2006)
New Revision: 4757

Added:
   labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/GolfingExample.java
   labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/golf.drl
Log:
JBRULES-309 Convert over Jess golfing example

Added: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/GolfingExample.java
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/GolfingExample.java	2006-06-13 18:02:30 UTC (rev 4756)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/GolfingExample.java	2006-06-13 21:41:51 UTC (rev 4757)
@@ -0,0 +1,76 @@
+package org.drools.examples;
+
+import java.io.InputStreamReader;
+
+import org.drools.RuleBase;
+import org.drools.RuleBaseFactory;
+import org.drools.WorkingMemory;
+import org.drools.compiler.PackageBuilder;
+
+public class GolfingExample {
+
+    /**
+     * @param args
+     */
+    public static void main(final String[] args) throws Exception {
+
+        final PackageBuilder builder = new PackageBuilder();
+        builder.addPackageFromDrl( new InputStreamReader( GolfingExample.class.getResourceAsStream( "golf.drl" ) ) );
+
+        final RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+        ruleBase.addPackage( builder.getPackage() );
+
+        final WorkingMemory workingMemory = ruleBase.newWorkingMemory();
+        
+        String[] names = new String[] { "Fred", "Joe", "Bob", "Tom" };
+        String[] colors = new String[] { "red", "blue", "plaid", "orange" };
+        int[] positions = new int[] { 1, 2, 3, 4 };
+        
+        for ( int n = 0; n < names.length; n++ ) {
+            for ( int c = 0; c < colors.length; c++ ) {
+                for ( int p = 0; p < positions.length; p++ ) {
+                    workingMemory.assertObject( new Golfer( names[n], colors[c], positions[p]) );
+                }                
+            }            
+        }
+
+        workingMemory.fireAllRules(); 
+    }
+
+
+    public static class Golfer {
+        private String name;
+        private String color;
+        private int position;
+        
+        public Golfer(String name,
+                      String color,
+                      int position) {
+            super();
+            this.name = name;
+            this.color = color;
+            this.position = position;
+        }
+        /**
+         * @return the color
+         */
+        public String getColor() {
+            return this.color;
+        }
+        /**
+         * @return the name
+         */
+        public String getName() {
+            return this.name;
+        }
+        
+        /**
+         * @return the name
+         */
+        public int getPosition() {
+            return this.position;
+        }        
+        
+    }
+}
+

Added: labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/golf.drl
===================================================================
--- labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/golf.drl	2006-06-13 18:02:30 UTC (rev 4756)
+++ labs/jbossrules/trunk/drools-examples/src/main/java/org/drools/examples/golf.drl	2006-06-13 21:41:51 UTC (rev 4757)
@@ -0,0 +1,55 @@
+package org.drools.examples;
+
+import org.drools.examples.GolfingExample.Golfer;
+
+rule "find solution"
+    when
+        // There is a golfer named Fred, 
+        // Whose positions is $p1
+        Golfer( $fredsName : name == "Fred", 
+                $fredsPosition : position, 
+                $fredsColor : color  )
+
+  		// The golfer to Fred's immediate right
+  		// is wearing blue pants
+        Golfer( $unknownsName : name != "Fred", 
+                $unknownsPosition :  position == ( new Integer( $fredsPosition.intValue() + 1 ) ),
+                $unknownsColor : color == "blue",
+                color != $fredsColor )
+
+        // Joe is in position 2  		          
+        Golfer( $joesName : name == "Joe", 
+                $joesPosition  : position == 2, 
+                position != $fredsPosition,
+                $joesColor : color != $fredsColor )
+
+ 		// Bob is wearing plaid pants        
+        Golfer( $bobsName : name == "Bob", 
+                name != $unknownsName,
+                $bobsPosition : position != $fredsPosition,
+                position != $unknownsPosition,              
+                position != $joesPosition,                                                  
+                $bobsColor : color == "plaid",
+                color != $fredsColor,
+                color != $joesColor,
+                color != $unknownsColor )
+ 		  		
+        // Tom isn't in position 1 or 4
+        // and isn't wearing orange	
+        Golfer( $tomsName : name == "Tom", 
+                $tomsPosition : position != 1,
+                position != 4,
+                position != $fredsPosition,
+                position != $joesPosition, 
+                position != $bobsPosition,                                
+                $tomsColor : color != "orange",
+                color != "blue",
+                color != $fredsColor,
+                color != $joesColor,
+                color != $bobsColor )                
+	then
+        System.out.println( "Fred " + $fredsPosition + " " + $fredsColor );
+        System.out.println( "Joe " + $joesPosition + " " + $joesColor );
+        System.out.println( "Bob " + $bobsPosition + " " + $bobsColor );
+        System.out.println( "Tom " + $tomsPosition + " " + $tomsColor );   
+end

[Jboss-svn-commits] JBL Code SVN: r4756 - labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java

From: <jbo...@li...> - 2006-06-13 18:02:34

Author: mar...@jb...
Date: 2006-06-13 14:02:30 -0400 (Tue, 13 Jun 2006)
New Revision: 4756

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java
Log:
JBRULES-308 using existing declarations for field contraints should be turned into bound variable constraints

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java	2006-06-13 17:46:45 UTC (rev 4755)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java	2006-06-13 18:02:30 UTC (rev 4756)
@@ -72,37 +72,37 @@
 import org.drools.spi.TypeResolver;
 
 public class RuleBuilder {
-    private Package                     pkg;
-    private Rule                        rule;
-    private RuleDescr                   ruleDescr;
+    private Package                           pkg;
+    private Rule                              rule;
+    private RuleDescr                         ruleDescr;
 
-    public String                       ruleClass;
-    public List                         methods;
-    public Map                          invokers;
+    public String                             ruleClass;
+    public List                               methods;
+    public Map                                invokers;
 
-    private Map                         invokerLookups;
+    private Map                               invokerLookups;
 
-    private Map                         descrLookups;
+    private Map                               descrLookups;
 
-    private Map                         declarations;
+    private Map                               declarations;
 
-    private int                         counter;
+    private int                               counter;
 
-    private ColumnCounter               columnCounter;
+    private ColumnCounter                     columnCounter;
 
-    private int                         columnOffset;
+    private int                               columnOffset;
 
-    private List                        errors;
+    private List                              errors;
 
-    private TypeResolver                typeResolver;
+    private TypeResolver                      typeResolver;
 
-    private Map                         notDeclarations;
+    private Map                               notDeclarations;
 
     private static final StringTemplateGroup  ruleGroup            = new StringTemplateGroup( new InputStreamReader( RuleBuilder.class.getResourceAsStream( "javaRule.stg" ) ),
-                                                                                        AngleBracketTemplateLexer.class );
+                                                                                              AngleBracketTemplateLexer.class );
 
     private static final StringTemplateGroup  invokerGroup         = new StringTemplateGroup( new InputStreamReader( RuleBuilder.class.getResourceAsStream( "javaInvokers.stg" ) ),
-                                                                                        AngleBracketTemplateLexer.class );
+                                                                                              AngleBracketTemplateLexer.class );
 
     private static final KnowledgeHelperFixer knowledgeHelperFixer = new KnowledgeHelperFixer();
     private static final FunctionFixer        functionFixer        = new FunctionFixer();
@@ -423,17 +423,27 @@
 
     private void build(final Column column,
                        final FieldBindingDescr fieldBindingDescr) {
+        Declaration declaration = (Declaration) this.declarations.get( fieldBindingDescr.getIdentifier() );
+        if ( declaration != null ) {
+            // This declaration already  exists, so make it a bound variable declaration instead
+            build( column,
+                   new BoundVariableDescr( fieldBindingDescr.getFieldName(),
+                                           "==",
+                                           fieldBindingDescr.getIdentifier() ) );
+            return;
+        }
+
         final Class clazz = ((ClassObjectType) column.getObjectType()).getClassType();
 
         final FieldExtractor extractor = getFieldExtractor( fieldBindingDescr,
-                                                      clazz,
-                                                      fieldBindingDescr.getFieldName() );
+                                                            clazz,
+                                                            fieldBindingDescr.getFieldName() );
         if ( extractor == null ) {
             return;
         }
 
-        final Declaration declaration = column.addDeclaration( fieldBindingDescr.getIdentifier(),
-                                                         extractor );
+        declaration = column.addDeclaration( fieldBindingDescr.getIdentifier(),
+                                             extractor );
 
         this.declarations.put( declaration.getIdentifier(),
                                declaration );
@@ -457,8 +467,8 @@
         final Class clazz = ((ClassObjectType) column.getObjectType()).getClassType();
 
         final FieldExtractor extractor = getFieldExtractor( boundVariableDescr,
-                                                      clazz,
-                                                      boundVariableDescr.getFieldName() );
+                                                            clazz,
+                                                            boundVariableDescr.getFieldName() );
         if ( extractor == null ) {
             return;
         }
@@ -474,8 +484,8 @@
         }
 
         final Evaluator evaluator = getEvaluator( boundVariableDescr,
-                                            extractor.getObjectType().getValueType(),
-                                            boundVariableDescr.getEvaluator() );
+                                                  extractor.getObjectType().getValueType(),
+                                                  boundVariableDescr.getEvaluator() );
         if ( evaluator == null ) {
             return;
         }
@@ -491,8 +501,8 @@
         final Class clazz = ((ClassObjectType) column.getObjectType()).getClassType();
 
         final FieldExtractor extractor = getFieldExtractor( literalDescr,
-                                                      clazz,
-                                                      literalDescr.getFieldName() );
+                                                            clazz,
+                                                            literalDescr.getFieldName() );
         if ( extractor == null ) {
             return;
         }
@@ -501,7 +511,7 @@
         if ( literalDescr.isStaticFieldValue() ) {
             final int lastDot = literalDescr.getText().lastIndexOf( '.' );
             final String className = literalDescr.getText().substring( 0,
-                                                                 lastDot );
+                                                                       lastDot );
             final String fieldName = literalDescr.getText().substring( lastDot + 1 );
             try {
                 final Class staticClass = this.typeResolver.resolveType( className );
@@ -531,8 +541,8 @@
         }
 
         final Evaluator evaluator = getEvaluator( literalDescr,
-                                            extractor.getObjectType().getValueType(),
-                                            literalDescr.getEvaluator() );
+                                                  extractor.getObjectType().getValueType(),
+                                                  literalDescr.getEvaluator() );
         if ( evaluator == null ) {
             return;
         }
@@ -557,22 +567,22 @@
 
         final Class clazz = ((ClassObjectType) column.getObjectType()).getClassType();
         final FieldExtractor extractor = getFieldExtractor( returnValueDescr,
-                                                      clazz,
-                                                      returnValueDescr.getFieldName() );
+                                                            clazz,
+                                                            returnValueDescr.getFieldName() );
         if ( extractor == null ) {
             return;
         }
 
         final Evaluator evaluator = getEvaluator( returnValueDescr,
-                                            extractor.getObjectType().getValueType(),
-                                            returnValueDescr.getEvaluator() );
+                                                  extractor.getObjectType().getValueType(),
+                                                  returnValueDescr.getEvaluator() );
         if ( evaluator == null ) {
             return;
         }
 
         final ReturnValueConstraint returnValueConstraint = new ReturnValueConstraint( extractor,
-                                                                                 declarations,
-                                                                                 evaluator );
+                                                                                       declarations,
+                                                                                       evaluator );
         column.addConstraint( returnValueConstraint );
 
         StringTemplate st = RuleBuilder.ruleGroup.getInstanceOf( "returnValueMethod" );
@@ -629,14 +639,14 @@
         final Class clazz = ((ClassObjectType) column.getObjectType()).getClassType();
 
         final FieldExtractor extractor = getFieldExtractor( predicateDescr,
-                                                      clazz,
-                                                      predicateDescr.getFieldName() );
+                                                            clazz,
+                                                            predicateDescr.getFieldName() );
         if ( extractor == null ) {
             return;
         }
 
         final Declaration declaration = column.addDeclaration( predicateDescr.getDeclaration(),
-                                                         extractor );
+                                                               extractor );
 
         this.declarations.put( declaration.getIdentifier(),
                                declaration );
@@ -647,7 +657,7 @@
         }
 
         final List[] usedIdentifiers = getUsedIdentifiers( predicateDescr,
-                                                     predicateDescr.getText() );
+                                                           predicateDescr.getText() );
         // Don't include the focus declaration, that hasn't been merged into the tuple yet.
         usedIdentifiers[0].remove( predicateDescr.getDeclaration() );
 
@@ -657,7 +667,7 @@
         }
 
         final PredicateConstraint predicateConstraint = new PredicateConstraint( declaration,
-                                                                           declarations );
+                                                                                 declarations );
         column.addConstraint( predicateConstraint );
 
         StringTemplate st = RuleBuilder.ruleGroup.getInstanceOf( "predicateMethod" );
@@ -722,7 +732,7 @@
         evalDescr.setClassMethodName( classMethodName );
 
         final List[] usedIdentifiers = getUsedIdentifiers( evalDescr,
-                                                     evalDescr.getText() );
+                                                           evalDescr.getText() );
 
         final Declaration[] declarations = new Declaration[usedIdentifiers[0].size()];
         for ( int i = 0, size = usedIdentifiers[0].size(); i < size; i++ ) {
@@ -787,7 +797,7 @@
                          classMethodName );
 
         final List[] usedIdentifiers = getUsedCIdentifiers( ruleDescr,
-                                                      ruleDescr.getConsequence() );
+                                                            ruleDescr.getConsequence() );
 
         final Declaration[] declarations = new Declaration[usedIdentifiers[0].size()];
         for ( int i = 0, size = usedIdentifiers[0].size(); i < size; i++ ) {
@@ -927,7 +937,7 @@
                                    final int valueType,
                                    final String evaluatorString) {
         final Evaluator evaluator = EvaluatorFactory.getEvaluator( valueType,
-                                                             evaluatorString );
+                                                                   evaluatorString );
 
         if ( evaluator == null ) {
             this.errors.add( new RuleError( this.rule,

[Jboss-svn-commits] JBL Code SVN: r4755 - labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java

From: <jbo...@li...> - 2006-06-13 17:46:59

Author: mar...@jb...
Date: 2006-06-13 13:46:45 -0400 (Tue, 13 Jun 2006)
New Revision: 4755

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java
Log:
JBRULES-304 RuleBuilder incorrectly adds used identifiers for expressions
-I made a mistake in the fix with regards to passing the used declarations, should now be fixed.

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java	2006-06-13 17:18:56 UTC (rev 4754)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java	2006-06-13 17:46:45 UTC (rev 4755)
@@ -548,7 +548,7 @@
         returnValueDescr.setClassMethodName( classMethodName );
 
         final List[] usedIdentifiers = getUsedIdentifiers( returnValueDescr,
-                                                     returnValueDescr.getText() );
+                                                           returnValueDescr.getText() );
 
         final Declaration[] declarations = new Declaration[usedIdentifiers[0].size()];
         for ( int i = 0, size = usedIdentifiers[0].size(); i < size; i++ ) {

[Jboss-svn-commits] JBL Code SVN: r4754 - labs/jbossweb/trunk/src/share/native/build

From: <jbo...@li...> - 2006-06-13 17:19:06

Author: jfr...@jb...
Date: 2006-06-13 13:18:56 -0400 (Tue, 13 Jun 2006)
New Revision: 4754

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Oops the clean was going to configure so the old libraries were used.


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-13 17:11:12 UTC (rev 4753)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-13 17:18:56 UTC (rev 4754)
@@ -458,7 +458,7 @@
 if ${BUILDLPNG}
 then
   Extract libpng ${LPNGURL} ${LPNGVER}
-  Build libpng-${LPNGVER} ${TOOLS}/LPNG "clean"  ""
+  Build libpng-${LPNGVER} ${TOOLS}/LPNG "" "clean"  ""
   ADDCONF="$ADDCONF --with-png-dir=$TOOLS/LPNG"
   LGDCONF="$LGDCONF --with-png=$TOOLS/LPNG"
   # libgd makes _very_ strange things with png.
@@ -494,7 +494,7 @@
 if ${BUILDXML2}
 then
   Extract libxml2 ${XML2URL} ${XML2VER}
-  Build libxml2-${XML2VER} ${TOOLS}/LIBXML2 "clean"  ""
+  Build libxml2-${XML2VER} ${TOOLS}/LIBXML2 "" "clean"  ""
   ADDCONF="$ADDCONF --with-libxml-dir=$TOOLS/LIBXML2"
 else
   ADDCONF="$ADDCONF --with-libxml-dir"

[Jboss-svn-commits] JBL Code SVN: r4753 - labs/jbossweb/trunk/src/share/native/build

From: <jbo...@li...> - 2006-06-13 17:11:31

Author: jfr...@jb...
Date: 2006-06-13 13:11:12 -0400 (Tue, 13 Jun 2006)
New Revision: 4753

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Arrange freetype URL.


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-13 08:34:05 UTC (rev 4752)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-06-13 17:11:12 UTC (rev 4753)
@@ -45,7 +45,7 @@
 ICNVURL=http://ftp.gnu.org/pub/gnu/libiconv/libiconv-${ICNVVER}.tar.gz
 
 FTT2VER=2.1.9
-FTT2URL=http://switch.dl.sourceforge.net/sourceforge/freetype/freetype-2.1.9.tar.gz
+FTT2URL=http://switch.dl.sourceforge.net/sourceforge/freetype/freetype-${FTT2VER}.tar.gz
 
 LBGDVER=2.0.28
 LBGDURL=http://www.boutell.com/gd/http/gd-${LBGDVER}.tar.gz

[Jboss-svn-commits] =?GB2312?B?L7jfL7y2L87EL8PYL9awL9K1L7uvL9G1L8G3Lw==?=

From: <eb...@we...> - 2006-06-13 16:38:16

jboss-svn-commits请转发给相关部门秘书助理查收，谢谢！


                        ※※※   高级文秘职业化训练  ※※※ 
       
                              2006年6月17-18日 (北 京)  
                              2006年7月1－2日  (上 海)
                              2006年7月22-23日 (深 圳)

===============================================================================

主办单位：职 业 人 生

联系电话：0 7 5 5－8 2 8 5 0 1 7 6      8 2 8 5 0 1 7 7    李小姐  宋先生

报名传真：0 7 5 5－8 2 8 5 0 1 7 7

时间地点：2 0 0 6年6月17-18日   北京瑞成大酒店 
          2 0 0 6年7月1－2日    上海兆安酒店
          2 0 0 6年7月22-23日   深圳新大洲酒店 

费　　用：1800元/人(含讲义、午餐、茶点、证书、合影、通讯录)
  
授课对象：企业中层行政管理干部和文秘工作人员，包括办公室主任、行政部经理、董事长秘书、
          总经理秘书、行政助理、行政主管、行政部门文员等
===============================================================================
                          §课--程--背--景§
                           
    对高级文秘来说，没有受到过系统训练，将无法从战略性全方位角度认知秘书与助理的工作；
在所从事的工作中感觉缺乏理论支持；工作中总是被动行事，不能主动掌握工作节奏；想给公司
节省费用，但却不知从何处下手，如何节省；行使对外界社会的管理职能时没有感觉到有很多事
物的“黑洞”要提防。。。。。
    诸如以上的问题，都是每个文秘人员所面对与困惑的，如何把握正确方向从而迅速提升自身
职业素养，成了我们必须面对与解决的课题。

===============================================================================
                         §课--程--收--获 §

→  掌握高级行政文秘所具备的基本技能、技巧
→  善于处理工作中的难点，掌握待人接物的技巧，实现有效的时间管理
→  实现现代文秘工作和档案管理工作的规范衔接
→  善于上传下达，掌握有效沟通的技巧
→  学习掌握规范的商务写作技巧，提高公文写作水平
→  学习掌握会议的组织思路及高效率的组织方法。
→  掌握基本的商务活动礼仪，使您适应日常商务场合的礼仪要求
→  掌握拜访客户的必备礼节，从细微之处体现您对他人的尊重
→  了解接待客户的礼仪细节，让您的每一位客人宾至如归
===============================================================================

                         § 讲--师--简--介§
   
    李老师  深圳管理咨询行业协会成员；深圳外商投资协会讲师、香港光华管理学院客座教授；
十多年从事企业管理与咨询工作的经验，在德隆集团、深高速、深南招商集团大型集团公司及管
理顾问公司历任市场经理、行政总监、培训总监等职位。对沟通技巧、客户服务、行政统筹、企
业文化等方面具有良好的培训与辅导经验；具有深厚的理论知识与丰富的实践操作能力；注重对
企业实际问题的分析和解决、讲求实效性和适用性。
    擅长课程：《职业经理人资格认证》、《领导力训练》、《企业中层管理技能培训》《时间
管理》、《目标管理》、《企业文化》、《沟通技巧》、《高级文秘职业素质修养》等。
    培训特色：以互动、情景式培训见长，注重受训人员的感悟及参与，通过各种实际案例及管
理游戏等方式充分调动参训人员的培训热情。
    曾培训或咨询过的企业有：中国电信、青岛中化集团、中石油、桑菲通讯、华侨城集团、奥
林巴斯、金碟软件（中国）有限公司、厦门航空、苏州三星电子、广东移动通信、蛇口南顺面粉、
深南招商集团、深高速、深圳中汽租赁有限公司、深圳恒波通讯、深圳华展国际、三洋机电等。

===============================================================================
                         §课--程--大--纲§

一、企业行政文秘职业特性与素质要求
  ◇  文秘人员的职业价值和作用
  →  案例：通用韦尔奇的秘书岗位的评价
  ◇  企业文秘工作的基本特征
  ◇  文秘人员的职责与主要工作内容
  →  案例：文秘人员的职位说明书样板
  ◇  文秘人员的自我角色定位
  ◇  优秀文秘人员的胜任素质
  →  案例：她作茧自缚发展机会毁于一旦
  →  案例：“一字之错”
  →  案例：一口痰“吐掉”一项合作
  ◇  文秘的职业发展前景与实现路径
  →  案例：这个文秘是如何晋升为董事长办公室主任的？

二、公文写作与处理实务
  →  案例：一个刚上任的办公室助理的公文遭遇
  ◇  公文分类
  ◇  公文的结构
  ◇  秘书文字支持应达到的要求
  →  案例：资深秘书谈写作基本功养成
  ◇  公文写作基本要领
  ◇  13种常用公文模版
  ◇  常用公函
  ◇  请示与报告、批复的写作与范例
  ◇  SMART原则与SWOT方法
  ◇  计划撰写注意事项

三、会务组织与管理
  ◇  会务分类－组织思路
  ◇  组织阶段：会前准备、会中协助、会后整理
  ◇  组织方法
  ◇  例会的组织
  ◇  大型会议、展会的组织
  ◇  如何担任会议主持人
  ◇  如何当好会议秘书？
  →  案例：某公司例会展开方式的变迁
  ◇  全景案例：某公司年度大型庆典活动策划始末
  →  案例：大型会议及活动策划案
  ◇  如何避免陷于会议忙碌之中？

四、文件资料管理与运用
  ◇  文档分类标准
  ◇  档案管理的原则
  ◇  文档的索引
  ◇  电子文档的保管
  ◇  名片系统管理
  ◇  印章的管理
  →  案例：档案员文件管理酿大错
  →  案例：有“人情味”的印章
  ◇  研讨：如何利用档案为公司业务服务？

五、信息档案管理
  ◇  信息管理基本流程
  ◇  信息的收集整理
  ◇  信息的传递
  ◇  信息的储存与保密
  ◇  保密意识与保密规则
  ◇  秘书的基本职业道德

六、人际沟通与工作协调技巧
  ◇  沟通对于秘书的意义
  ◇  秘书常用沟通方式之比较
  ◇  秘书人员的沟通技巧
  →  案例：如何听懂老板的“没有说出来的意思”？ 
  ◇  秘书让领导刮目相看、获得信任？
  ◇  如何与你的上司协调而不帮倒忙？
  ◇  秘书人员如何与各种上司相处？
  ◇  问题：我的上级调走了怎么办？
  →  案例：领导让我难为情，我该怎么办？
  →  案例：如何与同事或下级相处？
  →  案例：有人在你面前抱怨你的领导该怎么办？
  ◇  讨论：秘书应当如何发挥自身优势起好协调作用？

七、办公室5S及办公用品管理
  ◇  整理、整顿、清扫、清洁、修养
  ◇  文件处理流程化
  ◇  办公用品申购、领用
  ◇  建立固定资产台帐，确定责任人
  ◇  维护各类办公设备的正常使用

八、时间管理及工作统筹技巧
  ◇  时间管理的误区
  ◇  时间管理的原则
√目标管理与80/20法则
√缓急轻重的优先管理
√个人时间与领导工作时间计划与安排
√与别人的时间取得协作
  ◇  秘书时间管理小窍门
  ◇  宾客接待与电话处理
  ◇  自我组织管理
  ◇  自我情绪控制与压力管理

九、访客接待
  ◇  接待客人流程
  ◇  接待重要客户的注意事项
  ◇  来访电话对策
  ◇  案例分析一、二、三

十、如何成为上司得力助手
  ◇  优秀秘书的核心竞争力
  ◇  知己知彼：分析上司的特点
  ◇  如何对待不同类型的上司
  ◇  站在下级的位置上思考上级的事
  ◇  与上级相处三大注意事项
  ◇  上司的行程安排

商务礼仪与职业形象塑造
一、 新世纪个人形象塑造
  ◇  着装的TPO原则
  ◇  女士着装的要点
  ◇  男士着装的规范
二、 基本社交礼仪
  ◇  见面介绍的礼仪
  ◇  问候的礼仪
  ◇  名片的使用
  ◇  日常商务活动中的礼仪规范
  ◇  与工作有关的文体活动中的礼仪规范

三、 商务宴请礼仪
  ◇  中餐礼仪
  ◇  西餐礼仪
  ◇  日餐与茶道礼仪简介
  ◇  自助餐礼仪
  ◇  餐饮礼仪禁忌 

四、 仪容、仪表礼仪与仪态
  ◇  形象的社会心理学基础
  ◇  仪容礼仪规范
  ◇  化妆的礼仪
  ◇  站、坐、行的礼仪规范
  ◇  恰当的肢体语言

五、 电话礼仪
  ◇  接听电话的四大基本原则
  ◇  接听电话的七项注意 
  ◇  拨打电话的八大要点

六、 办公室礼仪
  ◇  创设整洁的办公环境
  ◇  适度的音量
  ◇  尊重他人的空间 
  ◇  与异性同事交往
                        
===============================================================================
                       
                 ■  ■  ■ 报 名 回 执  ■  ■  ■

填写完毕后请传真到：0 7 5 5－8 2 8 5 0 1 7 7 然后请电话确认！

其余的事情全部就交给我们来做，谢谢！
 
参会单位名称：__________________________________    参会人数:_________人 

参加课程：《 高级文秘职业化训练 》

联系人：________________电 话:________________传 真:________________邮 件：____________

参会费用 ￥：______________元 

参 会 人：_____________所任职务：____________移动电话：____________ 邮 件：__________

参 会 人：_____________所任职务：____________移动电话：_____________邮 件：__________

参 会 人：_____________所任职务：____________移动电话：_____________邮 件：__________

参 会 人：_____________所任职务：____________移动电话：_____________邮 件：__________

参 会 人：_____________所任职务：____________移动电话：_____________邮 件：__________

请您选择参会地点：（请选择打“√”） 　□1、北 京   □2、上 海   □3、深 圳
                                    
预订服务项目：是否住宿（请选择打“√”）：    口是     口否

付款方式（不接受支票）：（请选择打“√”） □1、现金  □2、转帐 □3、电汇

====================================

00:35:47

[Jboss-svn-commits] JBL Code SVN: r4752 - labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki

From: <jbo...@li...> - 2006-06-13 08:34:15

Author: szimano
Date: 2006-06-13 04:34:05 -0400 (Tue, 13 Jun 2006)
New Revision: 4752

Modified:
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
Log:
utf problems fixed


Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java	2006-06-13 07:55:30 UTC (rev 4751)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java	2006-06-13 08:34:05 UTC (rev 4752)
@@ -22,11 +22,12 @@
 package org.jboss.wiki;
 
 import java.io.File;
+import java.io.FileDescriptor;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
-import java.io.FileReader;
 import java.io.IOException;
+import java.io.InputStreamReader;
 import java.io.PrintWriter;
 import java.util.Date;
 import java.util.HashMap;
@@ -204,11 +205,11 @@
 					+ ".txt");
 
 			PrintWriter pageFileWriter;
-			FileReader pageFileReader;
+			InputStreamReader pageFileReader;
 
 			try {
 				pageFileWriter = new PrintWriter(pageFile, CHARSET);
-				pageFileReader = new FileReader(pageOldFile);
+				pageFileReader = new InputStreamReader(new FileInputStream(pageOldFile), CHARSET);
 
 				int b;
 
@@ -457,7 +458,7 @@
 				StringBuilder pageContent = new StringBuilder();
 
 				try {
-					FileReader input = new FileReader(pageFile);
+					InputStreamReader input = new InputStreamReader(new FileInputStream(pageFile), CHARSET);
 					// FileInputStream input = new FileInputStream(pageFile);
 
 					int nextChr = input.read();
@@ -567,8 +568,9 @@
 
 		if (loadContent) {
 			try {
-				FileReader input = new FileReader(pageFile);
-
+				
+				InputStreamReader input = new InputStreamReader(new FileInputStream(pageFile), CHARSET);
+				
 				int nextChr = input.read();
 
 				ret = new StringBuilder();

[Jboss-svn-commits] JBL Code SVN: r4751 - labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki

From: <jbo...@li...> - 2006-06-13 07:55:36

Author: szimano
Date: 2006-06-13 03:55:30 -0400 (Tue, 13 Jun 2006)
New Revision: 4751

Modified:
   labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
Log:
utf8 issues


Modified: labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java	2006-06-13 04:39:16 UTC (rev 4750)
+++ labs/jbosslabs/trunk/portal-extensions/jbosswiki/wiki-common/src/java/org/jboss/wiki/FileMediaDataSource.java	2006-06-13 07:55:30 UTC (rev 4751)
@@ -26,8 +26,8 @@
 import java.io.FileNotFoundException;
 import java.io.FileOutputStream;
 import java.io.FileReader;
-import java.io.FileWriter;
 import java.io.IOException;
+import java.io.PrintWriter;
 import java.util.Date;
 import java.util.HashMap;
 import java.util.HashSet;
@@ -66,6 +66,8 @@
 
 	private static final String propModFileName = "fileMod.properties";
 
+	private static final String CHARSET = "UTF-8";
+
 	private String pathToMediaTrash;
 
 	private String pathToMedia;
@@ -182,7 +184,7 @@
 
 			// harddisk - add new
 			// version
-			Properties pageProps = getPageProps(uidTranslated);
+			Properties pageProps = getPageProps(uid);
 
 			pageProps.setProperty(page.getLastVersion() + ".author", page
 					.getLastAuthor().getName());
@@ -201,11 +203,11 @@
 			File pageOldFile = new File(pathToMedia + "/" + uidTranslated
 					+ ".txt");
 
-			FileWriter pageFileWriter;
+			PrintWriter pageFileWriter;
 			FileReader pageFileReader;
 
 			try {
-				pageFileWriter = new FileWriter(pageFile);
+				pageFileWriter = new PrintWriter(pageFile, CHARSET);
 				pageFileReader = new FileReader(pageOldFile);
 
 				int b;
@@ -220,13 +222,14 @@
 
 				pageOldFile.delete();
 
-				pageFileWriter = new FileWriter(pageOldFile);
+				pageFileWriter = new PrintWriter(pageOldFile, CHARSET);
 
 				String pageContent = page.getContent();
 
-				for (int i = 0; i < pageContent.length(); i++) {
+				pageFileWriter.write(pageContent);
+				/*for (int i = 0; i < pageContent.length(); i++) {
 					pageFileWriter.write((int) pageContent.charAt(i));
-				}
+				}*/
 
 				pageFileWriter.close();
 			} catch (FileNotFoundException fnfe) {
@@ -269,14 +272,16 @@
 
 				pageDir.mkdirs();
 
-				FileWriter pageWriter = new FileWriter(new File(pathToMedia
-						+ "/" + uidTranslated + ".txt"));
+				PrintWriter pageWriter = new PrintWriter(new File(pathToMedia
+						+ "/" + uidTranslated + ".txt"), CHARSET);
 
 				String pageContent = page.getContent();
 
-				for (int i = 0; i < pageContent.length(); i++) {
+				pageWriter.write(pageContent);
+				
+				/*for (int i = 0; i < pageContent.length(); i++) {
 					pageWriter.write((int) pageContent.charAt(i));
-				}
+				}*/
 
 				pageWriter.close();
 
@@ -298,21 +303,22 @@
 	public Properties getPageProps(String pageName) {
 		Properties pageProps = new Properties();
 
+		String translatedPageName = FileDSCommons.translateToFileName(pageName);
 		try {
 			FileInputStream fpi = new FileInputStream(new File(pathToMedia
-					+ "/OLD/" + pageName + "/page.properties"));
+					+ "/OLD/" + translatedPageName + "/page.properties"));
 			pageProps.load(fpi);
 			fpi.close();
 		} catch (IOException ioe) {
 			// There is no prop file for some reson - create one.
 
-			File pagePropsFile = new File(pathToMedia + "/OLD/" + pageName);
+			File pagePropsFile = new File(pathToMedia + "/OLD/" + translatedPageName);
 
 			// create dirs
 			pagePropsFile.mkdirs();
 
 			// create file
-			pagePropsFile = new File(pathToMedia + "/OLD/" + pageName
+			pagePropsFile = new File(pathToMedia + "/OLD/" + translatedPageName
 					+ "/page.properties");
 
 			try {
@@ -556,7 +562,7 @@
 			boolean loadContent, int version) {
 		StringBuilder ret = null;
 
-		File pageFile = new File(pathToMedia + "/OLD/" + uid + "/" + version
+		File pageFile = new File(pathToMedia + "/OLD/" + FileDSCommons.translateToFileName(uid) + "/" + version
 				+ ".txt");
 
 		if (loadContent) {

[Jboss-svn-commits] JBL Code SVN: r4750 - labs/jbossrules/trunk/documentation/training/developers-course

From: <jbo...@li...> - 2006-06-13 04:39:26

Author: mic...@jb...
Date: 2006-06-13 00:39:16 -0400 (Tue, 13 Jun 2006)
New Revision: 4750

Added:
   labs/jbossrules/trunk/documentation/training/developers-course/Module 3 - Rule Engine Concepts 1.odp
Log:


Added: labs/jbossrules/trunk/documentation/training/developers-course/Module 3 - Rule Engine Concepts 1.odp
===================================================================
(Binary files differ)


Property changes on: labs/jbossrules/trunk/documentation/training/developers-course/Module 3 - Rule Engine Concepts 1.odp
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

[Jboss-svn-commits] JBL Code SVN: r4749 - labs/jbossrules/trunk

From: <jbo...@li...> - 2006-06-13 03:11:49

Author: mic...@jb...
Date: 2006-06-12 23:11:44 -0400 (Mon, 12 Jun 2006)
New Revision: 4749

Modified:
   labs/jbossrules/trunk/README_DEPENDENCIES.txt
Log:
wording update

Modified: labs/jbossrules/trunk/README_DEPENDENCIES.txt
===================================================================
--- labs/jbossrules/trunk/README_DEPENDENCIES.txt	2006-06-13 02:56:13 UTC (rev 4748)
+++ labs/jbossrules/trunk/README_DEPENDENCIES.txt	2006-06-13 03:11:44 UTC (rev 4749)
@@ -1,4 +1,4 @@
-This is a summary of what jars you may need in your situation. Abbreviated names have been used (only the first part of the jar name) for brevity.
+This is a summary of what jars you may need in your situation. Abbreviated names have been used (only the first part of the jar name).
 
 CORE RUNTIME
 Runtime assumes that you are "compiling" rules using drools-compiler.
@@ -40,4 +40,5 @@
 
 The most common use case is for COMPILER - this allows rules to be loaded from their source form, and includes the runtime engine of course. For example, if you wanted to be able to load rules from a drl source you would need: drools-core and the COMPILER jars mentioned above (not xerces, and not xml-apis), and commons-jar-eclipse, core-3.2. You will only need optional core jars if you are using those features.
 
-When building from source, the dependencies are managed by maven. In each module, there is a pom.xml file that lists the exact dependencies. 
\ No newline at end of file
+When building from source, the dependencies are managed by maven. In each module, there is a pom.xml file that lists the exact dependencies and exact version numbers. 
+Even if you use ant to build, the dependencies will be downloaded for you based on those pom.xml files.
\ No newline at end of file

550 messages has been excluded from this view by a project administrator.

Flat | Threaded

<< < 1 .. 18 19 20 21 22 .. 165 > >> (Page 20 of 165)