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

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 .. 33 34 35 36 37 .. 165 > >> (Page 35 of 165)

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

From: <jbo...@li...> - 2006-05-23 16:21:07

Author: jfr...@jb...
Date: 2006-05-23 12:20:49 -0400 (Tue, 23 May 2006)
New Revision: 4382

Added:
   labs/jbossweb/trunk/src/share/native/build/build.xml
   labs/jbossweb/trunk/src/share/native/build/php.xml
Log:
Try to build a simple standalone php demo application.


Added: labs/jbossweb/trunk/src/share/native/build/build.xml
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/build.xml	2006-05-23 15:56:17 UTC (rev 4381)
+++ labs/jbossweb/trunk/src/share/native/build/build.xml	2006-05-23 16:20:49 UTC (rev 4382)
@@ -0,0 +1,19 @@
+<project name="JBoss Web PHP demo" default="build" basedir=".">
+
+  <target name="build">
+    <war destfile="myapp.war" webxml="php.xml">
+      <fileset dir="../../examples/php">
+        <include name="**/*.php"/>
+      </fileset>
+      <lib dir="../../../../output/jbossweb-1.0.0.CR1/server/default/deploy/jbossweb.sar">
+        <include name="**/servlets-php.jar"/>
+      </lib>
+      <!-- No class needed
+      <classes dir="../../../../output/classes/org/apache/catalina/servlets/php">
+        <include name="**/Handler.class"/>
+      </classes>
+       -->
+    </war>
+  </target>
+
+</project>

Added: labs/jbossweb/trunk/src/share/native/build/php.xml
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/php.xml	2006-05-23 15:56:17 UTC (rev 4381)
+++ labs/jbossweb/trunk/src/share/native/build/php.xml	2006-05-23 16:20:49 UTC (rev 4382)
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+
+<!DOCTYPE web-app
+    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+    "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+  <display-name>JBoss Web PHP demo</display-name>
+  <description>
+     Welcome to JBoss Web PHP demo
+  </description>
+  <servlet>
+    <servlet-name>php</servlet-name>
+    <servlet-class>org.apache.catalina.servlets.php.Handler</servlet-class>
+    <init-param>
+      <param-name>debug</param-name>
+      <param-value>0</param-value>
+    </init-param>
+      <load-on-startup>6</load-on-startup>
+  </servlet>
+  <servlet>
+      <servlet-name>phps</servlet-name>
+      <servlet-class>org.apache.catalina.servlets.php.Highlight</servlet-class>
+  </servlet>
+
+  <servlet-mapping>
+      <servlet-name>php</servlet-name>
+      <url-pattern>*.php</url-pattern>
+  </servlet-mapping>
+    <servlet-mapping>
+      <servlet-name>phps</servlet-name>
+      <url-pattern>*.phps</url-pattern>
+  </servlet-mapping>
+</web-app>

[Jboss-svn-commits] JBL Code SVN: r4381 - labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/util/net

From: <jbo...@li...> - 2006-05-23 15:56:32

Author: mla...@jb...
Date: 2006-05-23 11:56:17 -0400 (Tue, 23 May 2006)
New Revision: 4381

Modified:
   labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/util/net/AprEndpoint.java
Log:
Add Poll.APR_POLLHUP+Poll.APR_POLLERR to Poll.add
flags, so that error and connection close events
gets signaled from poller. This works correctly only
on Linux platforms.

Modified: labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/util/net/AprEndpoint.java
===================================================================
--- labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/util/net/AprEndpoint.java	2006-05-23 15:46:10 UTC (rev 4380)
+++ labs/jbossweb/trunk/src/share/classes/org/apache/tomcat/util/net/AprEndpoint.java	2006-05-23 15:56:17 UTC (rev 4381)
@@ -1141,7 +1141,8 @@
                         synchronized (this) {
                             for (int i = (addCount - 1); i >= 0; i--) {
                                 int rv = Poll.add
-                                    (serverPollset, addS[i], Poll.APR_POLLIN);
+                                    (serverPollset, addS[i],
+                                     Poll.APR_POLLIN | Poll.APR_POLLHUP | Poll.APR_POLLERR);
                                 if (rv == Status.APR_SUCCESS) {
                                     keepAliveCount++;
                                 } else {
@@ -1500,7 +1501,8 @@
                         synchronized (this) {
                             for (int i = (addS.size() - 1); i >= 0; i--) {
                                 SendfileData data = (SendfileData) addS.get(i);
-                                int rv = Poll.add(sendfilePollset, data.socket, Poll.APR_POLLOUT);
+                                int rv = Poll.add(sendfilePollset, data.socket,
+                                                  Poll.APR_POLLOUT | Poll.APR_POLLHUP | Poll.APR_POLLERR);
                                 if (rv == Status.APR_SUCCESS) {
                                     sendfileData.put(new Long(data.socket), data);
                                     sendfileCount++;

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

From: <jbo...@li...> - 2006-05-23 15:46:26

Author: wrzep
Date: 2006-05-23 11:46:10 -0400 (Tue, 23 May 2006)
New Revision: 4380

Added:
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java
Removed:
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.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/StatusConfWatcher.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/StatusPortlet.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/ScoresService.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/service/impl/ScoresServiceImpl.java
   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/protocol/GetScoresRequest.java
   labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java
   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/ScoresManagerSync.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-05-23 14:18:35 UTC (rev 4379)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/Status.java	2006-05-23 15:46:10 UTC (rev 4380)
@@ -22,6 +22,7 @@
 
 package org.jboss.forge.status;
 
+import java.sql.Timestamp;
 import java.util.ArrayList;
 import java.util.HashMap;
 import java.util.List;
@@ -71,6 +72,8 @@
 	/** Projects present in the Status Matrix */
 	private Projects projects;
 
+	private Timestamp timestamp;
+	
 	private Logger log;
 	
 	/**
@@ -92,13 +95,13 @@
 		
 		PluginsValues pluginsValues;
 		try { 
-			// Get current scores 
+			// Get latest available scores
+			ScoresManager.init(portalName, serviceConf);
+			pluginsValues = ScoresManager.getLatestScores();
 			
-			ScoresManager.init(portalName, serviceConf);
+			// Compute and save current scores
 			ScoresManager.save(projects, pluginsConf);
-			
-			pluginsValues = ScoresManager.getCurrentScores();
-			
+			timestamp = ScoresManager.requestCurrentScores();
 		} catch (ScoresSaveException e) {
 			log.error("Saving scores failed ", e);
 			return;
@@ -203,4 +206,17 @@
 		return colMap;
 	}
 
+	public boolean needsUpdate() {
+		
+		PluginsValues pluginsValues = ScoresManager.getScores(timestamp);
+		
+		if (pluginsValues == null) {
+			return false;
+		}
+		
+		//TODO refresh scores
+		
+		return true;
+	}
+
 }
\ No newline at end of file

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java	2006-05-23 14:18:35 UTC (rev 4379)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusConfWatcher.java	2006-05-23 15:46:10 UTC (rev 4380)
@@ -29,8 +29,11 @@
 import org.jboss.shotoku.cache.ChangeType;
 import org.jboss.shotoku.cache.ShotokuResourceWatcher;
 
-public class StatusConfWatcher extends ShotokuResourceWatcher<String, StatusDescriptor> {
+public class StatusConfWatcher extends
+							ShotokuResourceWatcher<String, StatusDescriptor> {
 	
+	public StatusConfWatcher(long interval) {}
+	
 	private StatusDescriptor getDesc(String portalName) {
 		return new StatusDescriptor(portalName, getContentManager(portalName));
 	}
@@ -49,7 +52,8 @@
 		
 		/* Watch all project.xml files.
 		 * We assume that they contain entries used by plugins */ 
-		Set<String> projectXmlPathsSet = Locations.getProjectXmlPathsSet(portalName);
+		Set<String> projectXmlPathsSet =
+								Locations.getProjectXmlPathsSet(portalName);
 		
 		for (String projectXmlPath : projectXmlPathsSet) {
 			addWatchedPath(key, projectXmlPath);
@@ -59,7 +63,14 @@
 	}
 
 	@Override
-	protected void update(String key, StatusDescriptor currentObject, Map<String, ChangeType> changes) {
+	/* Called only when some of the watched resources changes. */
+	public void update(String key, StatusDescriptor currentObject,
+											Map<String, ChangeType> changes) {
 		put(key, getDesc(key));
 	}
+	
+	@Override
+	public void update(String key, StatusDescriptor desc) {
+		desc.update();
+	}
 }

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-05-23 14:18:35 UTC (rev 4379)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusDescriptor.java	2006-05-23 15:46:10 UTC (rev 4380)
@@ -83,6 +83,8 @@
 	}
 
 	public DelegateContext getContext() {
+		
+		update();	
 		return context;
 	}
 
@@ -102,5 +104,12 @@
 		Node root = parser.getDocument().getDocumentElement();
 		return root;
 	}
+
+	public void update() {
+		
+		if (status.needsUpdate()) {
+			fillContext();
+		}
+	}
 	
 }

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java	2006-05-23 14:18:35 UTC (rev 4379)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/StatusPortlet.java	2006-05-23 15:46:10 UTC (rev 4380)
@@ -29,7 +29,7 @@
 
 import org.jboss.forge.common.ForgeHelper;
 import org.jboss.forge.status.common.Locations;
-import org.jboss.forge.status.common.Tools;
+import org.jboss.forge.status.tools.Tools;
 
 import org.jboss.portal.common.context.DelegateContext;
 import org.jboss.portal.core.servlet.jsp.PortalJsp;

Deleted: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java	2006-05-23 14:18:35 UTC (rev 4379)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/common/Tools.java	2006-05-23 15:46:10 UTC (rev 4380)
@@ -1,21 +0,0 @@
-package org.jboss.forge.status.common;
-
-import org.jboss.forge.status.StatusDescriptor;
-import org.jboss.forge.status.StatusConfWatcher;
-
-import org.jboss.shotoku.aop.CacheItem;
-
-/**
- * Common functions.
- * @author Pawel Wrzeszcz
- */
-public class Tools {
-	
-	@CacheItem
-	private static StatusConfWatcher conf;
-	
-	public static synchronized StatusDescriptor getDesc(final String portalName) {
-		return conf.get(portalName);
-	}
-	
-}

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-05-23 14:18:35 UTC (rev 4379)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/plugins/Last7DaysStatusPlugin.java	2006-05-23 15:46:10 UTC (rev 4380)
@@ -23,7 +23,6 @@
 package org.jboss.forge.status.plugins;
 
 import java.util.Calendar;
-import java.util.Date;
 import java.util.Properties;
 
 import org.jboss.forge.common.projects.Projects;
@@ -74,13 +73,11 @@
 		long prevValue;
 		
 		Calendar cal = Calendar.getInstance();
-		Date now = cal.getTime();
 		cal.add(Calendar.DAY_OF_MONTH,-7);
-		Date prev = cal.getTime();
 		
 		try {
 			prevValue = ScoresManagerSync.getValue(
-					insidePlugin.getId(), projectId, prev,now);
+					insidePlugin.getId(), projectId, cal);
 		} catch (GetScoresException e) {
 			return 0;
 		}

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java	2006-05-23 14:18:35 UTC (rev 4379)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/ScoresService.java	2006-05-23 15:46:10 UTC (rev 4380)
@@ -22,7 +22,7 @@
 
 package org.jboss.forge.status.service;
 
-import java.util.Date;
+import java.util.Calendar;
 import java.util.List;
 
 import org.jboss.forge.common.projects.Projects;
@@ -39,8 +39,8 @@
 	public void save(Projects projects, List<PluginConf> pluginsConf,
 			String portalName) throws ScoresSaveException;	
 	
-	public PluginsValues getPluginsValues(String portalName, Date date)
+	public PluginsValues getPluginsValues(String portalName, Calendar cal)
 												throws GetScoresException;
 	
-	public boolean hasPluginsValues(String portalName, Date date);
+	public boolean hasPluginsValues(String portalName, Calendar cal);
 }
\ No newline at end of file

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-05-23 14:18:35 UTC (rev 4379)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresMDB.java	2006-05-23 15:46:10 UTC (rev 4380)
@@ -23,7 +23,7 @@
 package org.jboss.forge.status.service.impl;
 
 import java.sql.Timestamp;
-import java.util.Date;
+import java.util.Calendar;
 import java.util.List;
 
 import javax.ejb.ActivationConfigProperty;
@@ -109,13 +109,12 @@
 
 	private static void handleRequest(GetScoresRequest getScoresRequest) {
 		
-		Date date = getScoresRequest.getDate();
-		Date toDate = getScoresRequest.getToDate();
+		Calendar cal = getScoresRequest.getCalendar();
 		Timestamp timestamp = getScoresRequest.getTimestamp();
 		
 		PluginsValues pluginsValues = null;
 		try {
-			pluginsValues = ScoresManagerSync.getScores(date, toDate);
+			pluginsValues = ScoresManagerSync.getScores(cal);
 		} catch (GetScoresException e) {
 			log.error(e); //TODO
 			return; //??

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java	2006-05-23 14:18:35 UTC (rev 4379)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/ScoresServiceImpl.java	2006-05-23 15:46:10 UTC (rev 4380)
@@ -37,7 +37,6 @@
 import javax.ejb.Remote;
 
 import org.jboss.annotation.ejb.LocalBinding;
-import org.jboss.annotation.ejb.Management;
 import org.jboss.annotation.ejb.RemoteBinding;
 import org.jboss.annotation.ejb.Service;
 
@@ -68,7 +67,6 @@
 */
 
 @Service(objectName=Tags.STATUS_SERVICE_NAME)
-@Management(ScoresService.class)
 @Local(ScoresServiceLocal.class)
 @LocalBinding(jndiBinding=Constants.STATUS_LOCAL_SERVICE)
 @Remote(ScoresServiceRemote.class)
@@ -161,18 +159,17 @@
 	 * @return scores from the given date
 	 * @throws GetScoresException
 	 */
-	public PluginsValuesImpl getPluginsValues(String portalName, Date date)
+	public PluginsValuesImpl getPluginsValues(String portalName, Calendar cal)
 									throws GetScoresException {
 		
 		log.info("Returning plugins values...");
 		
 		// null date means today
-		if (date == null) {
-			Calendar cal = Calendar.getInstance();
-			date = cal.getTime();
+		if (cal == null) {
+			cal = Calendar.getInstance();
 		}
 		
-		String key = getNodeName(date);
+		String key = getNodeName(cal);
 		PluginsValuesImpl v = values.get(key);
 		
 		if (v == null) { // Not in cache => get value and store it
@@ -190,7 +187,7 @@
 			}
 
 			if (dir != null) {
-				v = getPluginsValues(dir, date);
+				v = getPluginsValues(dir, cal);
 				log.info("Finished.");
 				values.put(key,v);
 			}
@@ -206,12 +203,12 @@
 	 * @return
 	 * @throws GetScoresException 
 	 */
-	private PluginsValuesImpl getPluginsValues(Directory dir, Date date)
+	private PluginsValuesImpl getPluginsValues(Directory dir, Calendar cal)
 												throws GetScoresException {
 		
 		// Get appropriate node
 		Node node = null;
-		String nodeName = getNodeName(date);
+		String nodeName = getNodeName(cal);
 		
 		try {
 			node = dir.getNode(nodeName);
@@ -319,15 +316,16 @@
 
 	/**
 	 * Gets name of Node containing saved data from specified datestamp.
-	 * Notice that only year, month and day matter in passed <code>date</code>.
+	 * Notice that only year, month and day matter in passed <code>cal</code>.
 	 * 
-	 * @param date datestamp
 	 * @return Node name
 	 */
-	private String getNodeName(Date date) {
+	private String getNodeName(Calendar cal) {
 		
 		SimpleDateFormat df = new SimpleDateFormat("yyyy-MM-dd");
 		
+		Date date = cal.getTime();
+		
 		return df.format(date);
 	}
 	
@@ -336,18 +334,17 @@
 	 */
 	private String getCurrentNodeName() {
 		
-		Calendar cal = Calendar.getInstance();
-		Date today = cal.getTime();
+		Calendar today = Calendar.getInstance();
 		
 		return getNodeName(today); 
 	}
 
-	public boolean hasPluginsValues(String portalName, Date date) {
+	public boolean hasPluginsValues(String portalName, Calendar cal) {
 		
 		PluginsValuesImpl pluginsValues = null;
 		
 		try {
-			pluginsValues = getPluginsValues(portalName, date);
+			pluginsValues = getPluginsValues(portalName, cal);
 		} catch (GetScoresException e) {
 			return false;
 		}

Modified: 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-05-23 14:18:35 UTC (rev 4379)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/impl/protocol/GetScoresRequestImpl.java	2006-05-23 15:46:10 UTC (rev 4380)
@@ -23,8 +23,7 @@
 package org.jboss.forge.status.service.impl.protocol;
 
 import java.sql.Timestamp;
-import java.util.Date;
-
+import java.util.Calendar;
 import org.jboss.forge.status.service.protocol.GetScoresRequest;
 
 /**
@@ -34,26 +33,20 @@
 	
 	private static final long serialVersionUID = 7844595317056960170L;
 	
-	private Date date;
-	private Date toDate;
+	private Calendar cal;
 	private Timestamp timestamp;
 	
-	public GetScoresRequestImpl(Date date, Date toDate,
+	public GetScoresRequestImpl(Calendar cal,
 								Timestamp timestamp) {
 	
-		this.date = date;
-		this.toDate = toDate;
+		this.cal = cal;
 		this.timestamp = timestamp;
 	}
 
-	public Date getDate() {
-		return date;
+	public Calendar getCalendar() {
+		return cal;
 	}
 
-	public Date getToDate() {
-		return toDate;
-	}
-
 	public Timestamp getTimestamp() {
 		return timestamp;
 	}

Modified: 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-05-23 14:18:35 UTC (rev 4379)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/service/protocol/GetScoresRequest.java	2006-05-23 15:46:10 UTC (rev 4380)
@@ -24,16 +24,14 @@
 
 import java.io.Serializable;
 import java.sql.Timestamp;
-import java.util.Date;
+import java.util.Calendar;
 
 /**
 * @author Pawel Wrzeszcz
 */
 public interface GetScoresRequest extends Serializable {
 	
-	public Date getDate();
-	
-	public Date getToDate();
+	public Calendar getCalendar();
 
 	public Timestamp getTimestamp();
 

Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java	2006-05-23 14:18:35 UTC (rev 4379)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/templates/Columns.java	2006-05-23 15:46:10 UTC (rev 4380)
@@ -86,14 +86,6 @@
 		orderPluginId = XmlTools.getChildNodeValue(pageRoot,
 				Tags.ORDER_PLUGIN_ELEMENT);
 	}
-
-	/**
-	 * @param projects Projects present in the Status Matrix
-	 */
-	public Columns(Projects projects) {
-		this.projects = projects;
-		columns = new ArrayList<Column>();
-	}
 	
 	/**
 	 * Adds to the columns list columns defined in columnsRoot.

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-05-23 14:18:35 UTC (rev 4379)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManager.java	2006-05-23 15:46:10 UTC (rev 4380)
@@ -24,7 +24,7 @@
 
 import java.io.Serializable;
 import java.sql.Timestamp;
-import java.util.Date;
+import java.util.Calendar;
 import java.util.List;
 import java.util.Properties;
 
@@ -62,7 +62,7 @@
 	
 	public static void init(String portalName, ServiceConf serviceConf) {
 		
-		ScoresManagerSync.init(portalName, serviceConf); //TODO inheritance
+		ScoresManagerSync.init(portalName, serviceConf);
 		
 		isRemote = serviceConf.isRemote();
 		System.out.println("remote: " + isRemote);
@@ -85,23 +85,22 @@
 		}
 	}
 
-	public static PluginsValues getScores(Date date, Date toDate)
+	public static Timestamp requestScores(Calendar cal)
 										throws GetScoresException {
-										//TODO toDate
 		
 		Timestamp timestamp = new Timestamp(System.currentTimeMillis());
 		
 		GetScoresRequest getScoresRequest =
-						new GetScoresRequestImpl(date, toDate, timestamp);
-				
-		// Send message
+						new GetScoresRequestImpl(cal, timestamp);
+
 		try {
 			sendMessage(Constants.GET_SCORES_MESSAGE, getScoresRequest);
 		} catch (Exception e) {
 			throw new GetScoresException(e);
 		}
 		
-		PluginsValues pluginsValues = null;
+		return timestamp;
+		/*
 		int attempts = 0;
 		
 		for (;;) {
@@ -121,38 +120,47 @@
 				throw new GetScoresException(e);
 			}
 		}
+		*/
+	}
+
+	public static Timestamp requestCurrentScores()
+									throws GetScoresException {
 		
-	    return pluginsValues;
+		Calendar cal = Calendar.getInstance();
+		
+		return requestScores(cal);
 	}
 	
-	/**
-	 * For the specified plugin returns historical project score
-	 * from the given <code>date</code> in the past.
-	 * If scores from specified day are not available,
-	 * the next available scores saved at the day before or equal
-	 * to <code>toDate</code> are returned.
-	 * 
-	 * 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,
-											Date date, Date toDate)
-			throws GetScoresException {
+	public static PluginsValues getScores(Timestamp timestamp) {
+	
 		
-		PluginsValues pluginsValues = getScores(date, toDate);
-	    
-		return pluginsValues.getPluginValue(pluginId, projectId);
+		PluginsValues pluginsValues = RecordManager.get(timestamp);
+		
+		System.out.println("attempt");
+		
+		return pluginsValues;
 	}
-
-	public static PluginsValues getCurrentScores()
+	
+	public static PluginsValues getLatestScores()
 									throws GetScoresException {
 		
-		Date now = new Date();
+		Calendar cal = Calendar.getInstance();
+		int attempts = 0;
 		
-		return getScores(now, now);
+		for(;;) {
+			
+			if (ScoresManagerSync.hasScores(cal)) {
+				return ScoresManagerSync.getScores(cal);
+			}
+			
+			if ((attempts++) == Constants.MAX_ATTEMPTS) {
+				return null;
+			}
+			
+			cal.add(Calendar.DAY_OF_MONTH, -1);
+		}
 	}
+
 	
 	private static void sendMessage(String name, Serializable request) throws
 							NamingException, JMSException {
@@ -179,5 +187,4 @@
 	    sender.send(message);
 	    session.close ();
 	}
-
 }

Modified: 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-05-23 14:18:35 UTC (rev 4379)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/ScoresManagerSync.java	2006-05-23 15:46:10 UTC (rev 4380)
@@ -22,7 +22,7 @@
 
 package org.jboss.forge.status.tools;
 
-import java.util.Date;
+import java.util.Calendar;
 import java.util.List;
 import java.util.Properties;
 
@@ -76,14 +76,14 @@
 		service.save(projects, pluginsConf, portalName);
 	}
 
-	public static PluginsValues getScores(Date date, Date toDate)
+	public static PluginsValues getScores(Calendar cal)
 										throws GetScoresException {
 			
 		PluginsValues pluginsValues = null;
 		
 		try {
 			ScoresService service = getService(); 
-	        pluginsValues = service.getPluginsValues(portalName, date);
+	        pluginsValues = service.getPluginsValues(portalName, cal);
 	    } catch (Exception e) {
 	        throw new GetScoresException(e);
 	    }
@@ -95,12 +95,21 @@
 	    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.
-	 * If scores from specified day are not available,
-	 * the next available scores saved at the day before or equal
-	 * to <code>toDate</code> are returned.
 	 * 
 	 * Notice that only year, month and day matter in passed dates.
 	 * 
@@ -108,10 +117,10 @@
 	 * @throws GetScoresException
 	 */
 	public static long getValue(String pluginId, String projectId,
-											Date date, Date toDate)
+											Calendar cal)
 			throws GetScoresException {
 		
-		PluginsValues pluginsValues = getScores(date, toDate);
+		PluginsValues pluginsValues = getScores(cal);
 	    
 		return pluginsValues.getPluginValue(pluginId, projectId);
 	}
@@ -119,9 +128,9 @@
 	public static PluginsValues getCurrentScores()
 									throws GetScoresException {
 		
-		Date now = new Date();
+		Calendar now = Calendar.getInstance();
 		
-		return getScores(now, now);
+		return getScores(now);
 	}
 	
 	private static ScoresService getService() throws NamingException {

Added: labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java	2006-05-23 14:18:35 UTC (rev 4379)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/src/java/org/jboss/forge/status/tools/Tools.java	2006-05-23 15:46:10 UTC (rev 4380)
@@ -0,0 +1,21 @@
+package org.jboss.forge.status.tools;
+
+import org.jboss.forge.status.StatusDescriptor;
+import org.jboss.forge.status.StatusConfWatcher;
+
+import org.jboss.shotoku.aop.CacheItem;
+
+/**
+ * Common functions.
+ * @author Pawel Wrzeszcz
+ */
+public class Tools {
+	
+	@CacheItem(interval=10000)
+	private static StatusConfWatcher conf;
+	
+	public static synchronized StatusDescriptor getDesc(final String portalName) {
+		return conf.get(portalName);
+	}
+	
+}

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

From: <jbo...@li...> - 2006-05-23 14:18:46

Author: mla...@jb...
Date: 2006-05-23 10:18:35 -0400 (Tue, 23 May 2006)
New Revision: 4379

Modified:
   labs/jbossweb/trunk/src/share/native/NMAKEmakefile
   labs/jbossweb/trunk/src/share/native/build/buildworld.bat
Log:
Added redist task to build.

Modified: labs/jbossweb/trunk/src/share/native/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/share/native/NMAKEmakefile	2006-05-23 14:03:27 UTC (rev 4378)
+++ labs/jbossweb/trunk/src/share/native/NMAKEmakefile	2006-05-23 14:18:35 UTC (rev 4379)
@@ -132,6 +132,7 @@
 
 !IFNDEF INSTALLDIR
 INSTALLDIR = ../native-builds/windows-%CPU%/bin/native
+INSTALLLOC = ..\native-builds\windows-%CPU%\bin\native
 !ENDIF
 
 !IFDEF STATIC
@@ -147,4 +148,7 @@
 	@cp -f -t $(INSTALLDIR) $(WITH_OPENSSL)/out32dll/libeay32.dll
 	@cp -f -t $(INSTALLDIR) $(WITH_OPENSSL)/out32dll/ssleay32.dll
 	@cp -f -t $(INSTALLDIR) $(WITH_APR)/$(BUILDIR)/libapr-1.dll
+	@IF EXIST $(CRT_REDIST)\msvcr80.dll \
+	   xcopy $(CRT_REDIST)\* $(INSTALLLOC)\ /s /d > NUL
+	
 !ENDIF

Modified: labs/jbossweb/trunk/src/share/native/build/buildworld.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-23 14:03:27 UTC (rev 4378)
+++ labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-23 14:18:35 UTC (rev 4379)
@@ -11,9 +11,9 @@
 REM
 REM
 @if "%OS%" == "Windows_NT"  setlocal
-set MSVS8VC=C:\opt\msvs8\VC\bin
+set MSVS8VC=C:\opt\msvs8\VC
 set MSVS6VC=C:\opt\msvs6
-REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin
+REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC
 REM set MSVS6VC=C:\D\Microsoft\MSVS6
 
 set PSDK5=C:\opt\psdk6
@@ -48,7 +48,8 @@
 @if "%usesdk%" == "1" (
     call %MSVS6VC%\vs6vars
 ) else (
-    call %MSVS8VC%\vcvars32
+    call %MSVS8VC%\bin\vcvars32
+    set CRT_REDIST=%MSVS8VC%\redist\x86\Microsoft.VC80.CRT
 )
 goto cmdBuild
 
@@ -58,7 +59,8 @@
 @if "%usesdk%" == "1" (
     call %PSDK5%\SetEnv /X64 /RETAIL
 ) else (
-    call %MSVS8VC%\amd64\vcvarsamd64
+    call %MSVS8VC%\bin\amd64\vcvarsamd64
+    set CRT_REDIST=%MSVS8VC%\redist\amd64\Microsoft.VC80.CRT
 )
 goto cmdBuild
 
@@ -68,7 +70,9 @@
 @if "%usesdk%" == "1" (
     call %PSDK5%\SetEnv /SRV64 /RETAIL
 ) else (
-    call %MSVS8VC%\amd64\vcvarsamd64
+    REM Update to correct IA64 paths
+    call %MSVS8VC%\bin\amd64\vcvarsamd64
+    set CRT_REDIST=%MSVS8VC%\redist\amd64\Microsoft.VC80.CRT
 )
 goto cmdBuild

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

From: <jbo...@li...> - 2006-05-23 14:03:37

Author: mla...@jb...
Date: 2006-05-23 10:03:27 -0400 (Tue, 23 May 2006)
New Revision: 4378

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildworld.bat
Log:
Use correct alternate SDK path.

Modified: labs/jbossweb/trunk/src/share/native/build/buildworld.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-23 13:51:46 UTC (rev 4377)
+++ labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-23 14:03:27 UTC (rev 4378)
@@ -17,7 +17,7 @@
 REM set MSVS6VC=C:\D\Microsoft\MSVS6
 
 set PSDK5=C:\opt\psdk6
-REM PSDK5=C:\D\PSDK6
+REM set PSDK5=C:\D\Microsoft\PSDK6
 
 set OPENSSLBIN=buildssl
 set OPENSSLVER=0.9.8b

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

From: <jbo...@li...> - 2006-05-23 13:51:50

Author: mla...@jb...
Date: 2006-05-23 09:51:46 -0400 (Tue, 23 May 2006)
New Revision: 4377

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildworld.bat
Log:
Use MSVS6 as a compiler for x86 SDK build target.

Modified: labs/jbossweb/trunk/src/share/native/build/buildworld.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-23 13:40:25 UTC (rev 4376)
+++ labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-23 13:51:46 UTC (rev 4377)
@@ -12,7 +12,10 @@
 REM
 @if "%OS%" == "Windows_NT"  setlocal
 set MSVS8VC=C:\opt\msvs8\VC\bin
+set MSVS6VC=C:\opt\msvs6
 REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin
+REM set MSVS6VC=C:\D\Microsoft\MSVS6
+
 set PSDK5=C:\opt\psdk6
 REM PSDK5=C:\D\PSDK6
 
@@ -43,7 +46,7 @@
 set CPU=I386
 set OPENSSLBIN=buildsslasm %1
 @if "%usesdk%" == "1" (
-    call %PSDK5%\SetEnv /XP32 /RETAIL
+    call %MSVS6VC%\vs6vars
 ) else (
     call %MSVS8VC%\vcvars32
 )

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

From: <jbo...@li...> - 2006-05-23 13:40:32

Author: mla...@jb...
Date: 2006-05-23 09:40:25 -0400 (Tue, 23 May 2006)
New Revision: 4376

Modified:
   labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc
Log:
Added -DWINVER compiler flags.

Modified: labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc	2006-05-23 13:32:58 UTC (rev 4375)
+++ labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc	2006-05-23 13:40:25 UTC (rev 4376)
@@ -136,9 +136,9 @@
 !IF !DEFINED(NMAKE_WINVER) || "$(NMAKE_WINVER)" == ""
 NMAKE_WINVER = 0x0400
 _WIN32_IE = 0x0400
-NMAKE_WINNT  = -D_WIN95 -D_WIN32_WINDOWS=$(NMAKE_WINVER) -D_WIN32_IE=$(_WIN32_IE)
+NMAKE_WINNT  = -D_WIN95 -D_WIN32_WINDOWS=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) -D_WIN32_IE=$(_WIN32_IE)
 !ELSE
-NMAKE_WINNT  = -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER) -D_WIN32_IE=$(_WIN32_IE)
+NMAKE_WINNT  = -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER) -DWINVER=$(NMAKE_WINVER) -D_WIN32_IE=$(_WIN32_IE)
 !ENDIF
 
 !IF !DEFINED(BUILD) || "$(BUILD)" == ""

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

From: <jbo...@li...> - 2006-05-23 13:33:09

Author: mla...@jb...
Date: 2006-05-23 09:32:58 -0400 (Tue, 23 May 2006)
New Revision: 4375

Modified:
   labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc
Log:
Added -D_WIN32_IE define.

Modified: labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc	2006-05-23 11:37:37 UTC (rev 4374)
+++ labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc	2006-05-23 13:32:58 UTC (rev 4375)
@@ -103,7 +103,7 @@
 !ENDIF
 
 !IF !DEFINED(WINVER) || "$(WINVER)" == ""
-WINVER=WIN2003
+WINVER=WINXP
 !ENDIF
 
 
@@ -121,19 +121,24 @@
 
 !IF "$(WINVER)" == "WINNT"
 NMAKE_WINVER = 0x0500
+_WIN32_IE = 0x0500
 !ELSEIF "$(WINVER)" == "WINXP"
 NMAKE_WINVER = 0x0501
+_WIN32_IE = 0x0600
 !ELSEIF "$(WINVER)" == "WIN2003"
 NMAKE_WINVER = 0x0502
+_WIN32_IE = 0x0600
 !ELSEIF "$(WINVER)" == "NT4"
 NMAKE_WINVER = 0x0400
+_WIN32_IE = 0x0400
 !ENDIF
 
 !IF !DEFINED(NMAKE_WINVER) || "$(NMAKE_WINVER)" == ""
 NMAKE_WINVER = 0x0400
-NMAKE_WINNT  = -D_WIN95 -D_WIN32_WINDOWS=$(NMAKE_WINVER)
+_WIN32_IE = 0x0400
+NMAKE_WINNT  = -D_WIN95 -D_WIN32_WINDOWS=$(NMAKE_WINVER) -D_WIN32_IE=$(_WIN32_IE)
 !ELSE
-NMAKE_WINNT  = -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER)
+NMAKE_WINNT  = -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER) -D_WIN32_IE=$(_WIN32_IE)
 !ENDIF
 
 !IF !DEFINED(BUILD) || "$(BUILD)" == ""

[Jboss-svn-commits] JBL Code SVN: r4374 - in labs/jbossweb/trunk/src/share: . examples examples/php

From: <jbo...@li...> - 2006-05-23 11:37:42

Author: jfr...@jb...
Date: 2006-05-23 07:37:37 -0400 (Tue, 23 May 2006)
New Revision: 4374

Added:
   labs/jbossweb/trunk/src/share/examples/
   labs/jbossweb/trunk/src/share/examples/php/
   labs/jbossweb/trunk/src/share/examples/php/cal.php
   labs/jbossweb/trunk/src/share/examples/php/env.php
   labs/jbossweb/trunk/src/share/examples/php/font.php
   labs/jbossweb/trunk/src/share/examples/php/index.php
   labs/jbossweb/trunk/src/share/examples/php/info.php
   labs/jbossweb/trunk/src/share/examples/php/simplexml.php
Log:
Some php example to test the phpservlet.


Added: labs/jbossweb/trunk/src/share/examples/php/cal.php
===================================================================
--- labs/jbossweb/trunk/src/share/examples/php/cal.php	2006-05-23 11:07:22 UTC (rev 4373)
+++ labs/jbossweb/trunk/src/share/examples/php/cal.php	2006-05-23 11:37:37 UTC (rev 4374)
@@ -0,0 +1,453 @@
+<?
+//
+// JBoss, the OpenSource J2EE webOS
+//
+// Distributable under LGPL license.
+// See terms of license at gnu.org.
+//
+
+// borrowed to martin kraemer (ma...@ap...)
+// improved by jean-frederic clere (jf...@ap...)
+
+// Size and border.
+$width = 640;
+$height = 480;
+$border = 36;
+
+$ring_x = 20; /* ring-breite links & rechts von center line */
+$ring_y = 4;  /* ring-hoehe  +/- y-line */
+$ring_off_1 = 60; /* 1. ringabstand +/- y-richtung von mittelpunkt */
+$ring_off_2 = 130;/* 2. ringabstand +/- y-richtung von mittelpunkt */
+$line_off = 10; /* abstand der Tages-Linie vom Papierrand */
+
+$hh_min = 8;	// from 08:00h
+$hh_max = 18;	// to 18:00h
+
+$WkDay = array("So", "Mo", "Di", "Mi", "Do", "Fr", "Sa", "So");
+$Months = array("Jan", "Feb", "Mdr", "Apr", "Mai", "Jun",
+                "Jul", "Aug", "Sep",      "Okt", "Nov", "Dez");
+$Months_Full = array(
+                1=>"Januar", "Februar", "Mdrz", "April",   "Mai",      "Juni",
+                   "Juli",   "August",  "September", "Oktober", "November", "Dezember");
+
+class point_t {
+   var $x,$y;
+   // cfunction set($x,$y) {
+   function set($x,$y) {
+     $this->x = $x;
+     $this->y = $y;
+
+   }
+   function as_string() {
+     return '(' . $this->x . ',' . $this->y . ')';
+   }
+};
+
+class rect_t {
+  var $pos, $size;
+
+  function set($pos, $size) {
+    $this->pos = $pos;
+    $this->size = $size;
+  }
+
+  function set4($pos_x, $pos_y, $size_x, $size_y) {
+    $this->pos = point($pos_x, $pos_y);
+    $this->size = size($size_x, $size_y);
+  }
+  function draw($im, $color, $border) {
+    ImageFilledRectangle($im, $this->pos->x,           $this->pos->y,
+                         $this->pos->x+$this->size->x, $this->pos->y+$this->size->y,
+			 $color);
+    if ($border != $color)
+        ImageRectangle  ($im, $this->pos->x,           $this->pos->y,
+                         $this->pos->x+$this->size->x, $this->pos->y+$this->size->y,
+			 $border);
+  }
+
+  function is_within($x, $y)
+  {
+    return ($x >= $this->pos->x && $x < $this->pos->x+$this->size->x
+         && $y >= $this->pos->y && $y < $this->pos->y+$this->size->y);
+  }
+};
+
+
+class gifimage_t {
+  var $im, $size, $center;
+  var $width, $height; /* total canvas size */
+  var $links, $rechts; /* min. and max. x value of paper */
+  var $oben,  $unten;  /* min. and max. y value of paper */
+
+  function gifimage($size, $x_border, $y_border) {
+    $this->size = $size;
+    $this->center = point($size->x/2, $size->y/2);
+
+    $this->width = $size->x;
+    $this->height = $size->y;
+
+    $this->links  = $x_border;
+    $this->rechts = $this->width  - $x_border;
+    $this->oben   = $y_border;
+    $this->unten  = $this->height - $y_border;
+
+    /* Create Image */
+    $this->im = ImageCreate($size->x, $size->y);
+  }
+  function draw_line($x0,$y0,$x1,$y1,$color) {
+    ImageLine($this->im, $x0, $y0, $x1, $y1, $color);
+  }
+  function draw_rect($lu_x,$lu_y,$ro_x,$ro_y,$color,$border) {
+    ImageFilledRectangle($this->im, $lu_x, $lu_y, $ro_x, $ro_y, $color);
+    if ($border != $color)
+        ImageRectangle($this->im, $lu_x, $lu_y, $ro_x, $ro_y, $border);
+  }
+  function draw_circle($cx, $cy, $radius, $color, $border) {
+    ImageArc($this->im, $cx, $cy, 2*$radius, 2*$radius,   0, 180, $border);
+    ImageArc($this->im, $cx, $cy, 2*$radius, 2*$radius, 180, 360, $border);
+    ImageFillToBorder($this->im, $cx, $cy, $border, $color);
+  }
+  function draw_rounded_rect($l,$o, $r,$u, $radius, $color) {
+    ImageArc($this->im, $l+$radius, $o+$radius, 2*$radius, 2*$radius,   0, 180, $color);
+    ImageArc($this->im, $l+$radius, $o+$radius, 2*$radius, 2*$radius, 180, 360, $color);
+    ImageFillToBorder($this->im, $l+$radius, $o+$radius, $color, $color);
+    ImageArc($this->im, $l+$radius, $u-$radius, 2*$radius, 2*$radius,   0, 180, $color);
+    ImageArc($this->im, $l+$radius, $u-$radius, 2*$radius, 2*$radius, 180, 360, $color);
+    ImageFillToBorder($this->im, $l+$radius, $u-$radius, $color, $color);
+    ImageArc($this->im, $r-$radius, $u-$radius, 2*$radius, 2*$radius,   0, 180, $color);
+    ImageArc($this->im, $r-$radius, $u-$radius, 2*$radius, 2*$radius, 180, 360, $color);
+    ImageFillToBorder($this->im, $r-$radius, $u-$radius, $color, $color);
+    ImageArc($this->im, $r-$radius, $o+$radius, 2*$radius, 2*$radius,   0, 180, $color);
+    ImageArc($this->im, $r-$radius, $o+$radius, 2*$radius, 2*$radius, 180, 360, $color);
+    ImageFillToBorder($this->im, $r-$radius, $o+$radius, $color, $color);
+    /* Note that the 1st coord *MUST* be smaller in value than the 2nd */
+    ImageFilledRectangle($this->im, $l, $o+$radius, $r, $u-$radius, $color);
+    ImageFilledRectangle($this->im, $l+$radius, $o, $r-$radius, $u, $color);
+  }
+
+  function draw_planner_image() {
+    global $ring_x, $ring_y, $ring_off_1, $ring_off_2;
+    global $white, $grey, $btgrey, $dkgrey, $black, $green, $red, $blue;
+
+/* Buchruecken malen */
+    $this->draw_rounded_rect(0, 0, $this->width, $this->height, 10, $dkgrey);
+
+/* Weisses Papier */
+    $this->draw_rect($this->links, $this->oben, $this->rechts, $this->unten, $white, $black);
+
+/* Trennlinie links/rechts */
+    $this->draw_line($this->center->x, 0, $this->center->x, $this->height, $black);
+
+    $this->draw_planner_rings();
+  }
+
+  function draw_planner_rings() {
+    global $ring_x, $ring_y, $ring_off_1, $ring_off_2;
+    global $white, $grey, $btgrey, $dkgrey, $black;
+
+/* 4 Ringe zeichnen */
+    $this->draw_circle($this->center->x - $ring_x, $this->center->y - $ring_off_2, 2*$ring_y, $dkgrey, $black);
+    $this->draw_circle($this->center->x + $ring_x, $this->center->y - $ring_off_2, 2*$ring_y, $dkgrey, $black);
+    $this->draw_rect($this->center->x - $ring_x, $this->center->y - $ring_off_2 - $ring_y, $this->center->x + $ring_x, $this->center->y - $ring_off_2 + $ring_y, $grey, $black);
+
+    $this->draw_circle($this->center->x - $ring_x, $this->center->y - $ring_off_1, 2*$ring_y, $dkgrey, $black);
+    $this->draw_circle($this->center->x + $ring_x, $this->center->y - $ring_off_1, 2*$ring_y, $dkgrey, $black);
+    $this->draw_rect($this->center->x - $ring_x, $this->center->y - $ring_off_1 - $ring_y, $this->center->x + $ring_x, $this->center->y - $ring_off_1 + $ring_y, $grey, $black);
+
+    $this->draw_circle($this->center->x - $ring_x, $this->center->y + $ring_off_1, 2*$ring_y, $dkgrey, $black);
+    $this->draw_circle($this->center->x + $ring_x, $this->center->y + $ring_off_1, 2*$ring_y, $dkgrey, $black);
+    $this->draw_rect($this->center->x - $ring_x, $this->center->y + $ring_off_1 - $ring_y, $this->center->x + $ring_x, $this->center->y + $ring_off_1 + $ring_y, $grey, $black);
+
+    $this->draw_circle($this->center->x - $ring_x, $this->center->y + $ring_off_2, 2*$ring_y, $dkgrey, $black);
+    $this->draw_circle($this->center->x + $ring_x, $this->center->y + $ring_off_2, 2*$ring_y, $dkgrey, $black);
+    $this->draw_rect($this->center->x - $ring_x, $this->center->y + $ring_off_2 - $ring_y, $this->center->x + $ring_x, $this->center->y + $ring_off_2 + $ring_y, $grey, $black);
+  }
+
+  function weekday_rect ($day)
+  {
+    global $line_off;
+    $dy = ($this->unten - $this->oben) / 13;
+    switch($day)
+    {
+      case 1: /* mon */
+        return rect($this->links+$line_off, $this->oben+$dy, ($this->rechts - $this->links)/2 - 2*$line_off, 4*$dy);
+      case 2: /* tue */
+        return rect($this->links+$line_off, $this->oben+5*$dy, ($this->rechts - $this->links)/2 - 2*$line_off, 4*$dy);
+      case 3: /* wed */
+        return rect($this->links+$line_off, $this->oben+9*$dy, ($this->rechts - $this->links)/2 - 2*$line_off, 4*$dy);
+      case 4: /* thu */
+        return rect($this->center->x+$line_off, $this->oben+$dy, ($this->rechts - $this->links)/2 - 2*$line_off, 4*$dy);
+      case 5: /* fri */
+        return rect($this->center->x+$line_off, $this->oben+5*$dy, ($this->rechts - $this->links)/2 - 2*$line_off, 4*$dy);
+      case 6: /* sat */
+        return rect($this->center->x+$line_off, $this->oben+9*$dy, ($this->rechts - $this->links)/2 - 2*$line_off, 2*$dy);
+      case 7: /* sun */
+      case 0: /* sun */
+        return rect($this->center->x+$line_off, $this->oben+11*$dy, ($this->rechts - $this->links)/2 - 2*$line_off, 2*$dy);
+    }
+  }
+
+  function draw_week() {
+    global $red, $black, $dkgrey;
+    global $line_off;
+
+    for ($i=1; $i <= 7; ++$i)
+    {
+      $rect = $this->weekday_rect($i);
+      $this->draw_line($rect->pos->x, $rect->pos->y,
+                       $rect->pos->x+$rect->size->x, $rect->pos->y,
+		       ($i==7) ? $red : $black);
+    }
+  }
+
+  function fill_week($day_in_week)
+  { global $btgrey, $black, $red;
+    global $WkDay, $Months_Full, $line_off;
+
+    $split = getdate($day_in_week);
+    $monday = $day_in_week - 86400 * ((($split["wkday"]+7)-1)%7);
+
+    $split = getdate($monday);
+    $day = $split["mday"];
+    $month = $split["mon"];
+
+    $dayfont = 3;
+    $topfont = 4;
+    $topoff = ImageFontHeight($topfont)/2;
+
+    if (checkdate($month, $day+6, $split["year"]))
+    {
+      $header = $Months_Full[$month]." ".$split["year"];
+      $careful = 0;
+    }
+    else // note that months are 1-based, not 0-based!
+    {
+      $header = $Months_Full[$month]."/".$Months_Full[($month%12)+1]." ".$split["year"];
+      $careful = 1;
+    }
+
+    ImageString($this->im, $topfont, $this->links+$line_off, $this->oben+$line_off, $header, $black);
+
+    for ($i=1; $i <= 7; ++$i)
+    {
+      $rect = $this->weekday_rect($i);
+      if ($careful && !checkdate($month, $day-1+$i, $year)) {
+        ++$month;
+        $day = $i - 2;
+      }
+      ImageString($this->im, $dayfont,
+                  $rect->pos->x, $rect->pos->y + ImageFontHeight($dayfont)/2,
+		  " ".$WkDay[$i]." ".($day-1+$i), ($i==7) ? $red : $black);
+    }
+    return $monday;
+  }
+
+  function monthday_rect ($month, $day)
+  {
+    global $line_off;
+
+    $dy = ($this->unten - $this->oben) / 37;
+    $x = ($month & 1) ? $this->links+3*$line_off : $this->center->x+3*$line_off;
+
+    if ($day == 0)
+      return rect(($month & 1) ? $this->links : $this->center->x,
+                  $this->oben-1+3*$dy,
+                  ($this->rechts - $this->links)/2, $dy);
+    if ($day == 32)
+      return rect((($month & 1) ? $this->links : $this->center->x) + 3*$line_off,
+                  $this->oben+(2+$day)*$dy,
+                  ($this->rechts - $this->links)/2 - 6*$line_off,
+		  $this->unten - ($this->oben+(2+$day)*$dy));
+    else
+      return rect($x, $this->oben+(2+$day)*$dy,
+                  ($this->rechts - $this->links)/2 - 6*$line_off, $dy);
+  }
+
+  function draw_month() {
+    global $red, $black, $grey;
+    global $line_off;
+
+    for ($month = 0; $month <= 1; ++$month)
+    {
+      // Top delimiting line above 1st day
+      $rect = $this->monthday_rect($month,0);
+      $this->draw_line($rect->pos->x, $rect->pos->y,
+                       $rect->pos->x+$rect->size->x, $rect->pos->y,
+                       $black);
+      $this->draw_line($rect->pos->x, $rect->pos->y-1,
+                       $rect->pos->x+$rect->size->x, $rect->pos->y-1,
+                       $black);
+
+      for ($i=1; $i <= 31; ++$i)
+      {
+        $rect = $this->monthday_rect($month,$i);
+        $this->draw_line($rect->pos->x, $rect->pos->y+$rect->size->y,
+                         $rect->pos->x+$rect->size->x, $rect->pos->y+$rect->size->y,
+		         $grey);
+      }
+    }
+  }
+
+  function fill_month($day_in_week)
+  { global $btgrey, $black, $red, $pink;
+    global $WkDay, $Months_Full, $line_off;
+    global $hh_min, $hh_max;
+
+    $split = getdate($day_in_week);
+    $month = $split["mon"];
+    $year = $split["year"];
+
+    $dayfont = 1;
+    $hourfont = 1;
+    $topfont = 4;
+    $dayoff = ImageFontWidth($dayfont)*strlen(" Fr 31 ");
+    $houroff = ImageFontWidth($hourfont)*strlen("12:30");
+    $hourhite = ImageFontHeight($hourfont);
+
+    for ($sheet = 0; $sheet <= 1; ++$sheet)
+    {
+      // We're always putting an odd month on the left sheet,
+      // so no year wrap can occur between left & right sheet.
+      $header = $Months_Full[$month+$sheet]." ".$year;
+
+      ImageString($this->im, $topfont,
+                  ($sheet == 0) ? $this->links+$line_off : $this->center->x+$line_off,
+		  $this->oben+$line_off, $header, $black);
+
+      for ($day=1; $day <= 31; ++$day)
+      {
+        if (!checkdate($month+$sheet, $day, $year)) {
+            break;
+        }
+        $rect = $this->monthday_rect($month+$sheet, $day);
+        if (($day%7)==0)
+          $this->draw_rect($rect->pos->x+$dayoff, $rect->pos->y, 
+                           $rect->pos->x+$rect->size->x, $rect->pos->y+$rect->size->y,
+			   $btgrey, $btgrey);
+        ImageString($this->im, $dayfont,
+                    $rect->pos->x, $rect->pos->y + $rect->size->y/4,
+  		  " ".$WkDay[$day%7]." ".$day, (($day%7)==0) ? $red : $black);
+      }
+      // draw time marks
+      $rect = $this->monthday_rect($month+$sheet, 32);
+      for ($hh=$hh_min; $hh <= $hh_max; ++$hh)
+      {
+        $lbl = sprintf("%02d:00", $hh);
+        ImageStringUp($this->im, $hourfont,
+                      $rect->pos->x+$dayoff-$hourhite/2+($hh-$hh_min)*($rect->size->x-$dayoff)/($hh_max-$hh_min),
+		      $rect->pos->y+$houroff,$lbl,$black);
+      }
+//      Grey background to debug the hour entries
+//      $this->draw_rect($rect->pos->x+$dayoff, $rect->pos->y, 
+//                       $rect->pos->x+$rect->size->x, $rect->pos->y+$rect->size->y,
+//                       $btgrey, $btgrey);
+    }
+    return $day;
+  }
+
+};
+
+function point($x,$y) {
+     $ret = new point_t;
+     $ret->set($x,$y);
+     return $ret;
+}
+
+function size($x,$y) {
+     $ret = new point_t;
+     $ret->set($x,$y);
+     return $ret;
+}
+
+function rect($x0,$y0, $x1, $y1) {
+     $ret = new rect_t;
+     $ret->set4($x0,$y0, $x1, $y1);
+     return $ret;
+}
+
+$center = new point_t;
+$center->set($width/2, $height/2);
+
+$links  = $border;
+$rechts = $width - $border;
+$oben   = $border/2;
+$unten  = $height - $border/2;
+
+$im = new gifimage_t;
+$im->gifimage(size($width,$height), $border, $border/2);
+
+$transp = ImageColorAllocate($im->im, 254, 254, 254);
+ImageColorTransparent($im->im, $transp);
+
+$white = ImageColorAllocate($im->im, 255, 255, 255);
+$grey   = ImageColorAllocate($im->im, 211, 211, 211);
+$btgrey = ImageColorAllocate($im->im, 221, 221, 221);
+$dkgrey = ImageColorAllocate($im->im, 117, 117, 117);
+$black = ImageColorAllocate($im->im, 0, 0, 0);
+$pink = ImageColorAllocate($im->im, 255, 160, 160);
+
+$green = ImageColorAllocate($im->im, 0, 255, 0);
+$red = ImageColorAllocate($im->im, 255, 0, 0);
+$blue = ImageColorAllocate($im->im, 0, 0, 255);
+
+$im->draw_planner_image();
+
+// POST_data available?
+if (isset($Tag_waehlen_x) && isset($Tag_waehlen_y)) {
+  for ($i=1; $i <= 7; ++$i)
+  {
+    $rect = $im->weekday_rect($i);
+    if ($rect->is_within($Tag_waehlen_x, $Tag_waehlen_y)) {
+      $rect->draw($im->im, $btgrey, $btgrey);
+      $im->draw_planner_rings();
+      break;
+    }
+  }
+}
+
+if (!isset($today))
+  $today = time();
+
+//$im->draw_week();
+$im->draw_month();
+
+//$today = $im->fill_week($today);
+$today = $im->fill_month($today);
+
+  Header("Author: Mar...@Fu.../jf...@ap...");
+  $debug && Header("Expires: 0");
+  $debug && Header("Cache-Control: no-cache");
+  $debug && Header("Pragma: no-cache");
+
+  // Here we try the different type of possibly supported images.
+  if(function_exists("imagetypes")) {
+    $supported = ImageTypes();
+    if ($supported & IMG_PNG) {
+      Header("Content-type: image/png");
+      // Header("Content-Length: " . strlen($img));
+      ImagePng($im->im);
+    }
+    elseif ($supported & IMG_JPG) {
+      Header("Content-type: image/jpeg");
+      ImageJpeg($im->im,"",0.5);
+    }
+    elseif ($supported & IMG_GIF) {
+      Header("Content-type: image/gif");
+      ImageGif($im->im);
+    }
+  }
+  elseif(function_exists("imagegif")) {
+    Header("Content-type: image/gif");
+    ImageGif($im->im);
+  }
+  elseif(function_exists("imagePng")) {
+    Header("Content-type: image/png");
+    ImagePng($im->im);
+  }
+  elseif(function_exists("imageJpeg")) {
+    Header("Content-type: image/jpeg");
+    ImageJpeg($im->im,"",0.5);
+  }
+  else
+    die("No image support in this PHP server");
+?>

Added: labs/jbossweb/trunk/src/share/examples/php/env.php
===================================================================
--- labs/jbossweb/trunk/src/share/examples/php/env.php	2006-05-23 11:07:22 UTC (rev 4373)
+++ labs/jbossweb/trunk/src/share/examples/php/env.php	2006-05-23 11:37:37 UTC (rev 4374)
@@ -0,0 +1,68 @@
+<?php
+//
+// JBoss, the OpenSource J2EE webOS
+//
+// Distributable under LGPL license.
+// See terms of license at gnu.org.
+//
+
+  // Display mostly used php apache environment variables.
+  session_start();
+  print "<html>";
+  print "<head>";
+  print "<title>PHP Environment display test page</title>";
+  print "</head>";
+  print "<body bgcolor=white>";
+
+  print "<h1>Sample Application PHP</h1>";
+  print "This is the output of a php file that is part of ";
+  print "the env test application.  It displays the ";
+  print "request headers from the request we are currently ";
+  print "processing.<br>";
+  print $_SERVER["UNIQUE_ID"] . " " . $_SERVER["HTTPS"] . "<br>";
+  print $_SERVER["UNIQUE_ID"] . "<br>";
+  print $_SERVER["HTTPS"] . "<br>";
+  print $_SERVER["SSL_SESSION_ID"] . "<br>";
+
+  print "<h1>Print the _SERVER array</h1>";
+  do {
+    print "Key: ". key($_SERVER). " value: " . current($_SERVER) . "<br>";
+  } while (each($_SERVER));
+
+  print "<h1>Print the env data</h1>";
+  do {
+    print "Key: ". key($_ENV). " value: " . current($_ENV) . "<br>";
+  } while (each($_ENV));
+
+  print "<h1>Print the cookie data</h1>";
+  do {
+    print "Key: ". key($_COOKIE). " value: " . current($_COOKIE) . "<br>";
+  } while (each($_COOKIE));
+
+  print "<h1>Print the get(ted) data</h1>";
+  do {
+    print "Key: ". key($_GET). " value: " . current($_GET) . "<br>";
+  } while (each($_GET));
+
+  print "<h1>Print the post(ed) data</h1>";
+  do {
+    print "Key: ". key($_POST). " value: " . current($_POST) . "<br>";
+  } while (each($_POST));
+
+  print "<h1>Print the files(no idea what is that!) data</h1>";
+  do {
+    print "Key: ". key($_FILES). " value: " . current($_FILES) . "<br>";
+  } while (each($_FILES));
+
+  print "<h1>Print the session data</h1>";
+  print "_SESSION: ". $_SESSION . "<br>";
+  do {
+    print "Key: ". key($_SESSION). " value: " . current($_SESSION) . "<br>";
+  } while (each($_SESSION));
+
+  // $GLOBALS no purpose ;-)
+
+  print "</body>";
+  print "</html>";
+
+?>

Added: labs/jbossweb/trunk/src/share/examples/php/font.php
===================================================================
--- labs/jbossweb/trunk/src/share/examples/php/font.php	2006-05-23 11:07:22 UTC (rev 4373)
+++ labs/jbossweb/trunk/src/share/examples/php/font.php	2006-05-23 11:37:37 UTC (rev 4374)
@@ -0,0 +1,77 @@
+<?php
+//
+// JBoss, the OpenSource J2EE webOS
+//
+// Distributable under LGPL license.
+// See terms of license at gnu.org.
+//
+
+// borrowed to martin kraemer (ma...@ap...)
+// improved by jean-frederic clere (jf...@ap...)
+
+  // The fonts are needed to have the nice letters.
+  $fontdir = "";
+
+  if (!isset($height))
+    $height=60;
+
+  if (isset($script) && $script)
+    $font = $fontdir."shlyalln.ttf";
+  else
+    $font = $fontdir."dauphinn.ttf";
+
+  if ( ! ($host = gethostbyaddr($_SERVER["REMOTE_ADDR"])))
+    $host = $_SERVER["REMOTE_ADDR"];
+
+  if (!isset($text))
+    $text = "Hello ".$host.", nice to see you";
+
+  if(1) {
+  $imsize = ImageTTFBBox($height, 0, $font, $text);
+  $im = imagecreate(abs($imsize[4]-$imsize[0])+4, abs($imsize[5]-$imsize[1])+4);
+  $white = ImageColorAllocate($im, 255,255,255);
+  $black = ImageColorAllocate($im, 0,0,0);
+  $blue  = ImageColorAllocate($im, 0,0,255);
+
+  ImageTTFText($im, $height,0, -$imsize[6],-$imsize[5], $black, $font, $text);
+
+  if(function_exists("imagePng")) {
+    Header("Content-type: image/png");
+    ImagePng($im);
+  }
+  elseif(function_exists("imageJpeg")) {
+    Header("Content-type: image/jpeg");
+    ImageJpeg($im,"",0.5);
+  }
+  else
+    die("No image support in this PHP server");
+  ImageDestroy($im);
+  } else {
+  $im = imagecreate(800, $height*1.5);
+  $white = ImageColorAllocate($im, 255,255,255);
+  $black = ImageColorAllocate($im, 0,0,0);
+
+  ImageTTFText($im, $height-10, 0, 10, $height-5, $black, $font, $text);
+
+  $debug && Header("Expires: 0");
+  $debug && Header("Cache-Control: no-cache");
+  $debug && Header("Pragma: no-cache");
+
+  if(function_exists("imagegif")) {
+    Header("Content-type: image/gif");
+    ImageGif($im);
+  }
+  elseif(function_exists("imageJpeg")) {
+    Header("Content-type: image/jpeg");
+    ImageJpeg($im,"",0.5);
+  }
+  elseif(function_exists("imagePng")) {
+    Header("Content-type: image/png");
+    ImagePng($im);
+  }
+  else
+    die("No image support in this PHP server");
+  ImageDestroy($im);
+  }
+?>
+

Added: labs/jbossweb/trunk/src/share/examples/php/index.php
===================================================================
--- labs/jbossweb/trunk/src/share/examples/php/index.php	2006-05-23 11:07:22 UTC (rev 4373)
+++ labs/jbossweb/trunk/src/share/examples/php/index.php	2006-05-23 11:37:37 UTC (rev 4374)
@@ -0,0 +1,33 @@
+<?php
+//
+// JBoss, the OpenSource J2EE webOS
+//
+// Distributable under LGPL license.
+// See terms of license at gnu.org.
+//
+
+// Build a list of files ending with .php
+function dirPhp ($directory)
+{
+  $results = array();
+  $handler = opendir($directory);
+  while ($file = readdir($handler)) {
+    if ($file != '.' && $file != '..') {
+      $ext = substr(strrchr($file, '.'), 1);
+      if ($ext == "php")
+        $results[] = $file;
+    }
+  }
+  closedir($handler);
+  return $results;
+}
+
+// main part (build an index of the php files to allow easy testing.
+$phpfile = dirPhp(".");
+$count = count($phpfile);
+print "For the moment " . $count . " tests are available.<br>";
+for ($i = 0; $i < $count; $i++)
+{
+  print "<a href=\"" . $phpfile[$i] . "\">" . $phpfile[$i] . "<br />";
+}
+?>

Added: labs/jbossweb/trunk/src/share/examples/php/info.php
===================================================================
--- labs/jbossweb/trunk/src/share/examples/php/info.php	2006-05-23 11:07:22 UTC (rev 4373)
+++ labs/jbossweb/trunk/src/share/examples/php/info.php	2006-05-23 11:37:37 UTC (rev 4374)
@@ -0,0 +1,4 @@
+<?php
+  // Show all information, defaults to INFO_ALL
+  phpinfo();
+?>

Added: labs/jbossweb/trunk/src/share/examples/php/simplexml.php
===================================================================
--- labs/jbossweb/trunk/src/share/examples/php/simplexml.php	2006-05-23 11:07:22 UTC (rev 4373)
+++ labs/jbossweb/trunk/src/share/examples/php/simplexml.php	2006-05-23 11:37:37 UTC (rev 4374)
@@ -0,0 +1,21 @@
+<?php
+//
+// JBoss, the OpenSource J2EE webOS
+//
+// Distributable under LGPL license.
+// See terms of license at gnu.org.
+//
+
+// A small example to test libxml2 support.
+$dom = new domDocument;
+$dom->loadXML('<books><book><title>blah</title></book></books>');
+if (!$dom) {
+     echo 'Error while parsing the document';
+     exit;
+}
+
+$s = simplexml_import_dom($dom);
+
+echo "If all is OK you should read the title of the book: bla";
+echo $s->book[0]->title;
+?>

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

From: <jbo...@li...> - 2006-05-23 11:07:34

Author: tirelli
Date: 2006-05-23 07:07:22 -0400 (Tue, 23 May 2006)
New Revision: 4373

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java
Log:
Fixxing bug in RuleBaseConfiguration

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java	2006-05-23 10:48:38 UTC (rev 4372)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/RuleBaseConfiguration.java	2006-05-23 11:07:22 UTC (rev 4373)
@@ -135,7 +135,7 @@
      * @return
      */
     public boolean getBooleanProperty( String prop ) {
-        return Boolean.valueOf( prop ).booleanValue();
+        return Boolean.valueOf( (String) this.properties.get( prop ) ).booleanValue();
     }
     
     /**

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

From: <jbo...@li...> - 2006-05-23 10:48:48

Author: jfr...@jb...
Date: 2006-05-23 06:48:38 -0400 (Tue, 23 May 2006)
New Revision: 4372

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildphp.sh
Log:
Build on my machine PC (Red Hat Desktop release 4 (Nahant Update 3)).


Modified: labs/jbossweb/trunk/src/share/native/build/buildphp.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-05-23 10:39:14 UTC (rev 4371)
+++ labs/jbossweb/trunk/src/share/native/build/buildphp.sh	2006-05-23 10:48:38 UTC (rev 4372)
@@ -124,6 +124,7 @@
 
 #
 # depending on machine remove or add php extensions.
+OS=`uname -s`
 case `uname -n` in
   dev12)
     BUILDXML2=true
@@ -262,18 +263,26 @@
     ADDFLAGS="-I $JAVA_HOME/include/solaris"
     ;;
   *)
-    EXTTYPE=static
     ADDCONF="\
             --with-jpeg-dir \
             --with-png-dir \
             --with-freetype-dir \
-            --with-t1lib \
+            --with-t1lib=no \
             --with-xpm-dir \
             --with-mysqli \
             --with-mysql \
             --with-pdo-mysql \
             "
-    ;;
+    case ${OS} in
+      Linux)     
+        EXTTYPE=static
+        ADDFLAGS="-I $JAVA_HOME/include/linux"
+        ;;
+      SunOS)
+        EXTTYPE=shared
+        ADDFLAGS="-I $JAVA_HOME/include/solaris"
+        ;;
+    esac
 esac
 
 #

[Jboss-svn-commits] JBL Code SVN: r4371 - labs/jbossweb/trunk/xdocs/modules/php

From: <jbo...@li...> - 2006-05-23 10:39:26

Author: jfr...@jb...
Date: 2006-05-23 06:39:14 -0400 (Tue, 23 May 2006)
New Revision: 4371

Modified:
   labs/jbossweb/trunk/xdocs/modules/php/index.xml
Log:
Add the very explainations.


Modified: labs/jbossweb/trunk/xdocs/modules/php/index.xml
===================================================================
--- labs/jbossweb/trunk/xdocs/modules/php/index.xml	2006-05-23 09:53:11 UTC (rev 4370)
+++ labs/jbossweb/trunk/xdocs/modules/php/index.xml	2006-05-23 10:39:14 UTC (rev 4371)
@@ -14,13 +14,67 @@
 <body>
 
 <section name="Introduction">
-<p>This is the top-level entry point of the PHP Module documentation bundle for the
-<strong>JBossWeb server</strong>.
+<p>The PHP Module is a servlet that allows to run PHP embedded scripts.
+The servlet calls a native embedded PHP engine with libraries extentions.
+The PHP servlet allows to run most of the existing PHP scripts.
+</p>
+</section>
 
+<section name="Building">
+<p>
+To build simply run buildphp.sh.
+The buildphp.sh will detect you platform, download and build the dynamic libraries the PHP library needs and
+build the PHP servlet itself. Should should get a tarfile that contains the libraries and a war file with the examples.
 </p>
-<p>Select one of the links from the navigation menu (to the left) to drill
-down to the more detailed documentation that is available.</p>
+Already build PHP servlets and libraries are available at:
 <todo>Work in progress</todo>
 </section>
+
+<section name="Installing">
+After extracting the tarball corresponding to you platform do the following:
+Edit in the &lt;Server/&gt; of <code>$CATALINA_BASE/conf/server.xml</code> and add the following:
+<source>
+    &lt;Listener className="org.apache.catalina.servlets.php.LifecycleListener"/&gt;
+</source>
+If you want to enable php in all contexts edit  <code>$CATALINA_BASE/conf/web.xml</code> and add the following:
+<source>
+   &lt;servlet&gt;
+        &lt;servlet-name&gt;php&lt;/servlet-name&gt;
+        &lt;servlet-class&gt;org.apache.catalina.servlets.php.Handler&lt;/servlet-class&gt;
+        &lt;init-param&gt;
+          &lt;param-name&gt;debug&lt;/param-name&gt;
+          &lt;param-value&gt;0&lt;/param-value&gt;
+        &lt;/init-param&gt;
+         &lt;load-on-startup&gt;6&lt;/load-on-startup&gt;
+    &lt;/servlet&gt;
+    &lt;servlet&gt;
+        &lt;servlet-name&gt;phps&lt;/servlet-name&gt;
+        &lt;servlet-class&gt;org.apache.catalina.servlets.php.Highlight&lt;/servlet-class&gt;
+    &lt;/servlet&gt;
+
+    &lt;servlet-mapping&gt;
+        &lt;servlet-name&gt;php&lt;/servlet-name&gt;
+        &lt;url-pattern&gt;*.php&lt;/url-pattern&gt;
+    &lt;/servlet-mapping&gt;
+    &lt;servlet-mapping&gt;
+        &lt;servlet-name&gt;phps&lt;/servlet-name&gt;
+        &lt;url-pattern&gt;*.phps&lt;/url-pattern&gt;
+    &lt;/servlet-mapping&gt;
+</source>
+The war file of the tarball contains some php demos script they are deployed under /php-examples
+Try <code>http://localhost:8080/php-examples/index.php</code> to test them
+<todo>Work in progress</todo>
+</section>
+<section name="Additing extension libraies">
+For the moment this feature is only supported on Solaris.
+Edit the <code>php.ini</code> file and add your library extensions as in the following example:
+<source>
+extension_dir=/home/jfclere/SunOS_i386_tools/PHP/lib/php/extensions/no-debug-zts-20050922
+extension=openssl.so
+extension=pdo_pgsql.so
+extension=pgsql.so
+</source>
+<todo>Work in progress</todo>
+</section>
 </body>
 </document>

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

From: <jbo...@li...> - 2006-05-23 09:53:17

Author: mla...@jb...
Date: 2006-05-23 05:53:11 -0400 (Tue, 23 May 2006)
New Revision: 4370

Modified:
   labs/jbossweb/trunk/src/share/native/NMAKEmakefile
   labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc
Log:
Fix Windows/IA64 build

Modified: labs/jbossweb/trunk/src/share/native/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/share/native/NMAKEmakefile	2006-05-23 09:52:41 UTC (rev 4369)
+++ labs/jbossweb/trunk/src/share/native/NMAKEmakefile	2006-05-23 09:53:11 UTC (rev 4370)
@@ -48,9 +48,9 @@
 
 INCLUDES = -I$(SRCDIR)/include $(JAVA_INCLUDES)
 
-APRVER = "1.2.7"
-SSLVER = "0.9.8b"
-ZIPVER = "1.2.3"
+APRVER = 1.2.7
+SSLVER = 0.9.8b
+ZIPVER = 1.2.3
 
 !IFNDEF WITH_APR
 WITH_APR = srclib/apr-$(APRVER)

Modified: labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc	2006-05-23 09:52:41 UTC (rev 4369)
+++ labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc	2006-05-23 09:53:11 UTC (rev 4370)
@@ -103,7 +103,7 @@
 !ENDIF
 
 !IF !DEFINED(WINVER) || "$(WINVER)" == ""
-WINVER=WINNT
+WINVER=WIN2003
 !ENDIF
 
 
@@ -166,12 +166,16 @@
 !ELSEIF "$(CPU)" == "AMD64"
 CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64 -Wp64 -W3 /FIPRE64PRA.H
 !ELSEIF "$(CPU)" == "IA64"
-CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64 -W3 -Ap64 /FIPRE64PRA.H
+CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64 -W3 /FIPRE64PRA.H
 !ENDIF
 
 !IF "$(BUILD)" == "RELEASE"
+!IF "$(CPU)" == "I386"
 OPT_CFLAGS = -O2 -Ob2 -Oy- -Zi -DNDEBUG
 !ELSE
+OPT_CFLAGS = -O2 -Ob2 -Zi -DNDEBUG
+!ENDIF
+!ELSE
 OPT_CFLAGS = -Od -Zi -DDEBUG -D_DEBUG
 !ENDIF

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

From: <jbo...@li...> - 2006-05-23 09:52:48

Author: mla...@jb...
Date: 2006-05-23 05:52:41 -0400 (Tue, 23 May 2006)
New Revision: 4369

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildprep.bat
   labs/jbossweb/trunk/src/share/native/build/buildprep.sh
Log:
Use Tomcat native trunk instead version 1.1.3.

Modified: labs/jbossweb/trunk/src/share/native/build/buildprep.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildprep.bat	2006-05-23 07:39:38 UTC (rev 4368)
+++ labs/jbossweb/trunk/src/share/native/build/buildprep.bat	2006-05-23 09:52:41 UTC (rev 4369)
@@ -17,8 +17,8 @@
 set NATIVEEXT=current
 
 REM Use tag or trunk
-REM NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/trunk
-set NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_3
+set NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/trunk
+REM set NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_3
 
 set NATIVEDIST=tomcat-native-%NATIVEEXT%
 @rmdir /S /Q %NATIVEDIST% 2>NUL

Modified: labs/jbossweb/trunk/src/share/native/build/buildprep.sh
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildprep.sh	2006-05-23 07:39:38 UTC (rev 4368)
+++ labs/jbossweb/trunk/src/share/native/build/buildprep.sh	2006-05-23 09:52:41 UTC (rev 4369)
@@ -18,8 +18,8 @@
 NATIVEEXT="current"
 
 # Use tag or trunk
-# NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/trunk
-NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_3
+NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/trunk
+# NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_3
 
 NATIVEDIST=tomcat-native-${NATIVEEXT}
 rm -rf ${NATIVEDIST}

[Jboss-svn-commits] JBL Code SVN: r4368 - in labs/jbossweb/trunk/src: share/native/build share/native/php5servlet share/native/srclib/apr share/native/srclib/openssl windows/native/service/jbosssvc

From: <jbo...@li...> - 2006-05-23 07:39:52

Author: mla...@jb...
Date: 2006-05-23 03:39:38 -0400 (Tue, 23 May 2006)
New Revision: 4368

Modified:
   labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc
   labs/jbossweb/trunk/src/share/native/build/buildprep.bat
   labs/jbossweb/trunk/src/share/native/build/buildsvc.bat
   labs/jbossweb/trunk/src/share/native/build/buildworld.bat
   labs/jbossweb/trunk/src/share/native/php5servlet/NMAKEmakefile
   labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.rc
   labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile
   labs/jbossweb/trunk/src/share/native/srclib/openssl/buildssl.bat
   labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat
   labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat
   labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat
   labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile
   labs/jbossweb/trunk/src/windows/native/service/jbosssvc/jboss.rc
Log:
Use svn:eol-style CRLF for windows-only resources

Modified: labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc	2006-05-23 07:33:59 UTC (rev 4367)
+++ labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc	2006-05-23 07:39:38 UTC (rev 4368)
@@ -1,264 +1,264 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ====================================================================
-#
-# NMAKEcommon.inc Master makefile definitions.
-#                 This file defines CPU architecture and basic compiler
-#                 and linker parameters.
-# Common params:
-#                 CPU       Compile for specified CPU. Supported CPU's are:
-#                           i386
-#                           AMD64
-#                           IA64
-#                           If not specified it will default to the
-#                           PROCESSOR_ARCHITECTURE environment variable
-#                           or to the i386 if not specified.
-#                 WINVER    Compile for specified Windows version
-#                           WINNT   for Windows 2000 and up(default)
-#                           WINXP   for Windows XP and up
-#                           WIN2003 for Windows 2003 and up
-#                           Deprecated targets (may not even compile):
-#                               NT4     for Windows NT4 and up
-#                               WIN9X   for Windows 95, 98 and Me
-#                 BUILD     Build version
-#                           RETAIL or RELEASE (default)
-#                           DEBUG
-#                 TARGET    Build application target
-#                           EXE Console executable (default)
-#                           GUI Windows GUI executable
-#                           DLL Dynamic Link Library
-#                           LIB Static library
-# Environment variables  used:
-#                 CFLAGS    Added to the common CFLAGS
-#                 CPPFLAGS  Added to the common CPPFLAGS
-#                 LIBS      Added to the common LIBS
-#                 INCLUDES  Added to the common INCLUDES
-#                 LFLAGS    Added to the common LFLAGS
-#                 RCFLAGS   Added to the common RCFLAGS
-#
-# Originally contributed by Mladen Turk <mturk jboss.com>
-#
-# ====================================================================
-#
-
-!IF !DEFINED(CC) || "$(CC)" == ""
-CC = cl.exe
-!ENDIF
-
-!IF !DEFINED(LINK) || "$(LINK)" == ""
-LINK = link.exe
-!ENDIF
-
-!IF !DEFINED(RC) || "$(RC)" == ""
-RC = rc.exe
-!ENDIF
-
-# Read the PROCESSOR_ARCHITECTURE environment value for a CPU type
-
-!IF !DEFINED(CPU) || "$(CPU)" == ""
-!IF "$(PROCESSOR_ARCHITECTURE)" == ""
-CPU=I386
-!ELSE
-CPU = $(PROCESSOR_ARCHITECTURE)
-!ENDIF
-!ENDIF
-
-!IF "$(CPU)" == "i386" || "$(CPU)" == "x86"
-CPU=I386
-!ENDIF
-
-!IF "$(CPU)" != "I386"
-!IF "$(CPU)" != "AMD64"
-!IF "$(CPU)" != "IA64"
-!ERROR Must specify CPU environment variable (I386, AMD64, IA64)
-!ENDIF
-!ENDIF
-!ENDIF
-
-!IF !DEFINED(TARGET) || "$(TARGET)" == ""
-TARGET=EXE
-!ENDIF
-
-!IF "$(TARGET)" != "EXE"
-!IF "$(TARGET)" != "GUI"
-!IF "$(TARGET)" != "DLL"
-!IF "$(TARGET)" != "LIB"
-!ERROR Must specify TARGET environment variable (EXE, GUI, DLL, LIB)
-!ENDIF
-!ENDIF
-!ENDIF
-!ENDIF
-
-!IF !DEFINED(WINVER) || "$(WINVER)" == ""
-WINVER=WINNT
-!ENDIF
-
-
-!IF "$(WINVER)" != "WINNT"
-!IF "$(WINVER)" != "WINXP"
-!IF "$(WINVER)" != "WIN2003"
-!IF "$(WINVER)" != "NT4"
-!IF "$(WINVER)" != "WIN9X"
-!ERROR Must specify WINVER environment variable (WINNT, WINXP, WIN2003, NT4, WIN9X)
-!ENDIF
-!ENDIF
-!ENDIF
-!ENDIF
-!ENDIF
-
-!IF "$(WINVER)" == "WINNT"
-NMAKE_WINVER = 0x0500
-!ELSEIF "$(WINVER)" == "WINXP"
-NMAKE_WINVER = 0x0501
-!ELSEIF "$(WINVER)" == "WIN2003"
-NMAKE_WINVER = 0x0502
-!ELSEIF "$(WINVER)" == "NT4"
-NMAKE_WINVER = 0x0400
-!ENDIF
-
-!IF !DEFINED(NMAKE_WINVER) || "$(NMAKE_WINVER)" == ""
-NMAKE_WINVER = 0x0400
-NMAKE_WINNT  = -D_WIN95 -D_WIN32_WINDOWS=$(NMAKE_WINVER)
-!ELSE
-NMAKE_WINNT  = -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER)
-!ENDIF
-
-!IF !DEFINED(BUILD) || "$(BUILD)" == ""
-BUILD=RELEASE
-!ENDIF
-
-!IFDEF RELEASE
-BUILD=RELEASE
-!ENDIF
-
-!IFDEF DEBUG
-BUILD=DEBUG
-!ENDIF
-
-!IFDEF NODEBUG
-BUILD=RELEASE
-!ENDIF
-
-!IF "$(BUILD)" != "RELEASE"
-!IF "$(BUILD)" != "DEBUG"
-!ERROR Must specify BUILD environment variable (RELEASE, DEBUG)
-!ENDIF
-!ENDIF
-
-# Common flags for all platforms
-CMN_CFLAGS =  -c -nologo -DWIN32 -D_WIN32 -D_WINDOWS $(NMAKE_WINNT)
-
-!IF "$(CPU)" == "I386"
-CPU_CFLAGS = -D_X86_=1 -W3
-!ELSEIF "$(CPU)" == "AMD64"
-CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64 -Wp64 -W3 /FIPRE64PRA.H
-!ELSEIF "$(CPU)" == "IA64"
-CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64 -W3 -Ap64 /FIPRE64PRA.H
-!ENDIF
-
-!IF "$(BUILD)" == "RELEASE"
-OPT_CFLAGS = -O2 -Ob2 -Oy- -Zi -DNDEBUG
-!ELSE
-OPT_CFLAGS = -Od -Zi -DDEBUG -D_DEBUG
-!ENDIF
-
-!IF DEFINED(STATIC_CRT)
-CRT_CFLAGS = -D_MT -MT
-!ELSE
-CRT_CFLAGS = -D_MT -MD
-!ENDIF
-
-!IF "$(BUILD)" == "DEBUG"
-CRT_CFLAGS = $(CRT_CFLAGS)d
-!ENDIF
-
-CFLAGS = $(CMN_CFLAGS) $(CPU_CFLAGS) $(OPT_CFLAGS) $(CRT_CFLAGS) $(CFLAGS)
-
-!IF DEFINED(EXTRA_CFLAGS)
-CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS)
-!ENDIF
-
-
-# Linker section
-LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib $(LIBS)
-!IF "$(CPU)" == "AMD64" || "$(CPU)" == "IA64"
-LIBS = $(LIBS) bufferoverflowu.lib
-!ENDIF
-
-!IF DEFINED(EXTRA_LIBS)
-LIBS = $(LIBS) $(EXTRA_LIBS)
-!ENDIF
-
-COMMON_LFLAGS = /NOLOGO
-
-# Always add debugging to the linker
-OPT_LFLAGS = /INCREMENTAL:NO /DEBUG
-!IF "$(BUILD)" == "RELEASE"
-OPT_LFLAGS = /OPT:REF
-!ENDIF
-
-!IF "$(TARGET)" == "EXE"
-LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:CONSOLE /MACHINE:$(CPU)
-!ELSEIF "$(TARGET)" == "GUI"
-LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:WINDOWS /MACHINE:$(CPU)
-!ELSEIF "$(TARGET)" == "DLL"
-LFLAGS = $(COMMON_LFLAGS) /DLL /SUBSYSTEM:WINDOWS /MACHINE:$(CPU)
-!ELSEIF "$(TARGET)" == "LIB"
-LFLAGS = -lib $(COMMON_LFLAGS)
-!ENDIF
-
-!IF DEFINED(EXTRA_LFLAGS)
-LFLAGS = $(LFLAGS) $(EXTRA_LFLAGS)
-!ENDIF
-
-!IF "$(TARGET)" != "LIB"
-LFLAGS = $(LFLAGS) $(OPT_LFLAGS)
-!ENDIF
-
-# Resource compiler flags
-
-BASE_RCFLAGS=/l 0x409
-!IF "$(BUILD)" == "RELEASE"
-BASE_RCFLAGS = $(BASE_RCFLAGS) /d "NDEBUG"
-!ELSE
-BASE_RCFLAGS = $(BASE_RCFLAGS) /d "_DEBUG" /d "DEBUG"
-!ENDIF
-RCFLAGS = $(BASE_RCFLAGS) $(RCFLAGS)
-
-# Build Target dir e.g. WINNT_I386_RELEASE_DLL
-!IF !DEFINED(BUILDIR) || "$(BUILDIR)" == ""
-!IF !DEFINED(BUILDIR_EXT) || "$(BUILDIR_EXT)" == ""
-BUILDIR = $(WINVER)_$(CPU)_$(TARGET)_$(BUILD)
-!ELSE
-BUILDIR = $(WINVER)_$(CPU)_$(BUILDIR_EXT)_$(BUILD)
-!ENDIF
-!ENDIF
-
-!IF "$(OS)" == "Windows_NT"
-CLEANTARGET=if exist "$(BUILDIR)/$(NULL)" rd /s /q $(BUILDIR)
-!ELSE
-CLEANTARGET=deltree /y $(BUILDIR)
-!ENDIF
-
-MAKETARGET=if not exist "$(BUILDIR)/$(NULL)" mkdir $(BUILDIR)
-
-!IF DEFINED(JAVA_HOME) && "$(JAVA_HOME)" != ""
-JAVA_INCLUDES=-I "$(JAVA_HOME)/include"
-!IF "$(CPU)" != "I386"
-JAVA_INCLUDES=$(JAVA_INCLUDES) -I "$(JAVA_HOME)/include/win64"
-!ENDIF
-JAVA_INCLUDES=$(JAVA_INCLUDES) -I "$(JAVA_HOME)/include/win32"
-!ENDIF
+# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ====================================================================
+#
+# NMAKEcommon.inc Master makefile definitions.
+#                 This file defines CPU architecture and basic compiler
+#                 and linker parameters.
+# Common params:
+#                 CPU       Compile for specified CPU. Supported CPU's are:
+#                           i386
+#                           AMD64
+#                           IA64
+#                           If not specified it will default to the
+#                           PROCESSOR_ARCHITECTURE environment variable
+#                           or to the i386 if not specified.
+#                 WINVER    Compile for specified Windows version
+#                           WINNT   for Windows 2000 and up(default)
+#                           WINXP   for Windows XP and up
+#                           WIN2003 for Windows 2003 and up
+#                           Deprecated targets (may not even compile):
+#                               NT4     for Windows NT4 and up
+#                               WIN9X   for Windows 95, 98 and Me
+#                 BUILD     Build version
+#                           RETAIL or RELEASE (default)
+#                           DEBUG
+#                 TARGET    Build application target
+#                           EXE Console executable (default)
+#                           GUI Windows GUI executable
+#                           DLL Dynamic Link Library
+#                           LIB Static library
+# Environment variables  used:
+#                 CFLAGS    Added to the common CFLAGS
+#                 CPPFLAGS  Added to the common CPPFLAGS
+#                 LIBS      Added to the common LIBS
+#                 INCLUDES  Added to the common INCLUDES
+#                 LFLAGS    Added to the common LFLAGS
+#                 RCFLAGS   Added to the common RCFLAGS
+#
+# Originally contributed by Mladen Turk <mturk jboss.com>
+#
+# ====================================================================
+#
+
+!IF !DEFINED(CC) || "$(CC)" == ""
+CC = cl.exe
+!ENDIF
+
+!IF !DEFINED(LINK) || "$(LINK)" == ""
+LINK = link.exe
+!ENDIF
+
+!IF !DEFINED(RC) || "$(RC)" == ""
+RC = rc.exe
+!ENDIF
+
+# Read the PROCESSOR_ARCHITECTURE environment value for a CPU type
+
+!IF !DEFINED(CPU) || "$(CPU)" == ""
+!IF "$(PROCESSOR_ARCHITECTURE)" == ""
+CPU=I386
+!ELSE
+CPU = $(PROCESSOR_ARCHITECTURE)
+!ENDIF
+!ENDIF
+
+!IF "$(CPU)" == "i386" || "$(CPU)" == "x86"
+CPU=I386
+!ENDIF
+
+!IF "$(CPU)" != "I386"
+!IF "$(CPU)" != "AMD64"
+!IF "$(CPU)" != "IA64"
+!ERROR Must specify CPU environment variable (I386, AMD64, IA64)
+!ENDIF
+!ENDIF
+!ENDIF
+
+!IF !DEFINED(TARGET) || "$(TARGET)" == ""
+TARGET=EXE
+!ENDIF
+
+!IF "$(TARGET)" != "EXE"
+!IF "$(TARGET)" != "GUI"
+!IF "$(TARGET)" != "DLL"
+!IF "$(TARGET)" != "LIB"
+!ERROR Must specify TARGET environment variable (EXE, GUI, DLL, LIB)
+!ENDIF
+!ENDIF
+!ENDIF
+!ENDIF
+
+!IF !DEFINED(WINVER) || "$(WINVER)" == ""
+WINVER=WINNT
+!ENDIF
+
+
+!IF "$(WINVER)" != "WINNT"
+!IF "$(WINVER)" != "WINXP"
+!IF "$(WINVER)" != "WIN2003"
+!IF "$(WINVER)" != "NT4"
+!IF "$(WINVER)" != "WIN9X"
+!ERROR Must specify WINVER environment variable (WINNT, WINXP, WIN2003, NT4, WIN9X)
+!ENDIF
+!ENDIF
+!ENDIF
+!ENDIF
+!ENDIF
+
+!IF "$(WINVER)" == "WINNT"
+NMAKE_WINVER = 0x0500
+!ELSEIF "$(WINVER)" == "WINXP"
+NMAKE_WINVER = 0x0501
+!ELSEIF "$(WINVER)" == "WIN2003"
+NMAKE_WINVER = 0x0502
+!ELSEIF "$(WINVER)" == "NT4"
+NMAKE_WINVER = 0x0400
+!ENDIF
+
+!IF !DEFINED(NMAKE_WINVER) || "$(NMAKE_WINVER)" == ""
+NMAKE_WINVER = 0x0400
+NMAKE_WINNT  = -D_WIN95 -D_WIN32_WINDOWS=$(NMAKE_WINVER)
+!ELSE
+NMAKE_WINNT  = -D_WINNT -D_WIN32_WINNT=$(NMAKE_WINVER)
+!ENDIF
+
+!IF !DEFINED(BUILD) || "$(BUILD)" == ""
+BUILD=RELEASE
+!ENDIF
+
+!IFDEF RELEASE
+BUILD=RELEASE
+!ENDIF
+
+!IFDEF DEBUG
+BUILD=DEBUG
+!ENDIF
+
+!IFDEF NODEBUG
+BUILD=RELEASE
+!ENDIF
+
+!IF "$(BUILD)" != "RELEASE"
+!IF "$(BUILD)" != "DEBUG"
+!ERROR Must specify BUILD environment variable (RELEASE, DEBUG)
+!ENDIF
+!ENDIF
+
+# Common flags for all platforms
+CMN_CFLAGS =  -c -nologo -DWIN32 -D_WIN32 -D_WINDOWS $(NMAKE_WINNT)
+
+!IF "$(CPU)" == "I386"
+CPU_CFLAGS = -D_X86_=1 -W3
+!ELSEIF "$(CPU)" == "AMD64"
+CPU_CFLAGS = -D_AMD64_=1 -DWIN64 -D_WIN64 -Wp64 -W3 /FIPRE64PRA.H
+!ELSEIF "$(CPU)" == "IA64"
+CPU_CFLAGS = -D_IA64_=1 -DWIN64 -D_WIN64 -Wp64 -W3 -Ap64 /FIPRE64PRA.H
+!ENDIF
+
+!IF "$(BUILD)" == "RELEASE"
+OPT_CFLAGS = -O2 -Ob2 -Oy- -Zi -DNDEBUG
+!ELSE
+OPT_CFLAGS = -Od -Zi -DDEBUG -D_DEBUG
+!ENDIF
+
+!IF DEFINED(STATIC_CRT)
+CRT_CFLAGS = -D_MT -MT
+!ELSE
+CRT_CFLAGS = -D_MT -MD
+!ENDIF
+
+!IF "$(BUILD)" == "DEBUG"
+CRT_CFLAGS = $(CRT_CFLAGS)d
+!ENDIF
+
+CFLAGS = $(CMN_CFLAGS) $(CPU_CFLAGS) $(OPT_CFLAGS) $(CRT_CFLAGS) $(CFLAGS)
+
+!IF DEFINED(EXTRA_CFLAGS)
+CFLAGS = $(CFLAGS) $(EXTRA_CFLAGS)
+!ENDIF
+
+
+# Linker section
+LIBS = kernel32.lib advapi32.lib ws2_32.lib mswsock.lib ole32.lib shell32.lib rpcrt4.lib $(LIBS)
+!IF "$(CPU)" == "AMD64" || "$(CPU)" == "IA64"
+LIBS = $(LIBS) bufferoverflowu.lib
+!ENDIF
+
+!IF DEFINED(EXTRA_LIBS)
+LIBS = $(LIBS) $(EXTRA_LIBS)
+!ENDIF
+
+COMMON_LFLAGS = /NOLOGO
+
+# Always add debugging to the linker
+OPT_LFLAGS = /INCREMENTAL:NO /DEBUG
+!IF "$(BUILD)" == "RELEASE"
+OPT_LFLAGS = /OPT:REF
+!ENDIF
+
+!IF "$(TARGET)" == "EXE"
+LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:CONSOLE /MACHINE:$(CPU)
+!ELSEIF "$(TARGET)" == "GUI"
+LFLAGS = $(COMMON_LFLAGS) /SUBSYSTEM:WINDOWS /MACHINE:$(CPU)
+!ELSEIF "$(TARGET)" == "DLL"
+LFLAGS = $(COMMON_LFLAGS) /DLL /SUBSYSTEM:WINDOWS /MACHINE:$(CPU)
+!ELSEIF "$(TARGET)" == "LIB"
+LFLAGS = -lib $(COMMON_LFLAGS)
+!ENDIF
+
+!IF DEFINED(EXTRA_LFLAGS)
+LFLAGS = $(LFLAGS) $(EXTRA_LFLAGS)
+!ENDIF
+
+!IF "$(TARGET)" != "LIB"
+LFLAGS = $(LFLAGS) $(OPT_LFLAGS)
+!ENDIF
+
+# Resource compiler flags
+
+BASE_RCFLAGS=/l 0x409
+!IF "$(BUILD)" == "RELEASE"
+BASE_RCFLAGS = $(BASE_RCFLAGS) /d "NDEBUG"
+!ELSE
+BASE_RCFLAGS = $(BASE_RCFLAGS) /d "_DEBUG" /d "DEBUG"
+!ENDIF
+RCFLAGS = $(BASE_RCFLAGS) $(RCFLAGS)
+
+# Build Target dir e.g. WINNT_I386_RELEASE_DLL
+!IF !DEFINED(BUILDIR) || "$(BUILDIR)" == ""
+!IF !DEFINED(BUILDIR_EXT) || "$(BUILDIR_EXT)" == ""
+BUILDIR = $(WINVER)_$(CPU)_$(TARGET)_$(BUILD)
+!ELSE
+BUILDIR = $(WINVER)_$(CPU)_$(BUILDIR_EXT)_$(BUILD)
+!ENDIF
+!ENDIF
+
+!IF "$(OS)" == "Windows_NT"
+CLEANTARGET=if exist "$(BUILDIR)/$(NULL)" rd /s /q $(BUILDIR)
+!ELSE
+CLEANTARGET=deltree /y $(BUILDIR)
+!ENDIF
+
+MAKETARGET=if not exist "$(BUILDIR)/$(NULL)" mkdir $(BUILDIR)
+
+!IF DEFINED(JAVA_HOME) && "$(JAVA_HOME)" != ""
+JAVA_INCLUDES=-I "$(JAVA_HOME)/include"
+!IF "$(CPU)" != "I386"
+JAVA_INCLUDES=$(JAVA_INCLUDES) -I "$(JAVA_HOME)/include/win64"
+!ENDIF
+JAVA_INCLUDES=$(JAVA_INCLUDES) -I "$(JAVA_HOME)/include/win32"
+!ENDIF


Property changes on: labs/jbossweb/trunk/src/share/native/build/NMAKEcommon.inc
___________________________________________________________________
Name: svn:eol-style
   - native
   + CRLF

Modified: labs/jbossweb/trunk/src/share/native/build/buildprep.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildprep.bat	2006-05-23 07:33:59 UTC (rev 4367)
+++ labs/jbossweb/trunk/src/share/native/build/buildprep.bat	2006-05-23 07:39:38 UTC (rev 4368)
@@ -1,60 +1,60 @@
-@echo off
-REM
-REM JBoss, the OpenSource J2EE webOS
-REM
-REM Distributable under LGPL license.
-REM See terms of license at gnu.org.
-REM
-REM
-REM @author Mladen Turk
-REM
-REM
-REM
-@if "%OS%" == "Windows_NT"  setlocal
-set NATIVETAG=HEAD
-
-REM Replace NATIVEEXT with tagged version number, like 1.1.0
-set NATIVEEXT=current
-
-REM Use tag or trunk
-REM NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/trunk
-set NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_3
-
-set NATIVEDIST=tomcat-native-%NATIVEEXT%
-@rmdir /S /Q %NATIVEDIST% 2>NUL
-svn export -r %NATIVETAG% %NATIVESVN%/jni/native %NATIVEDIST%
-
-set APRVER=1.2.7
-set SSLVER=0.9.8b
-
-REM Prebuild
-cd %NATIVEDIST%
-mkdir srclib
-cd srclib
-
-REM Download APR
-wget http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-%APRVER%-win32-src.zip
-unzip -qo apr-%APRVER%-win32-src.zip
-@del /Q apr-%APRVER%-win32-src.zip
-
-REM Download OpenSSL
-wget http://www.openssl.org/source/openssl-%SSLVER%.tar.gz
-tar zxf openssl-%SSLVER%.tar.gz 2>NUL
-@del /Q openssl-%SSLVER%.tar.gz
-cd ..
-cd ..
-
-cp ./buildworld.bat %NATIVEDIST%/
-cp ./buildsvc.bat %NATIVEDIST%/
-cp ./NMAKEcommon.inc %NATIVEDIST%/build/
-cp ../NMAKEmakefile %NATIVEDIST%/
-cp ../srclib/apr/NMAKEmakefile %NATIVEDIST%/srclib/apr-%APRVER%/
-cp ../srclib/openssl/*.bat %NATIVEDIST%/srclib/openssl-%SSLVER%/
-
-REM zip -9rqo ../../%NATIVEDIST%.zip %NATIVEDIST%
-REM tar cfz ../../%NATIVEDIST%.tar.gz %NATIVEDIST%
-
-REM @rmdir /S /Q %NATIVEDIST%
-REM Instead packing move the prepared sources.
-@rmdir /S /Q ..\..\%NATIVEDIST% 2>NUL
-@mv %NATIVEDIST% ../../
+@echo off
+REM
+REM JBoss, the OpenSource J2EE webOS
+REM
+REM Distributable under LGPL license.
+REM See terms of license at gnu.org.
+REM
+REM
+REM @author Mladen Turk
+REM
+REM
+REM
+@if "%OS%" == "Windows_NT"  setlocal
+set NATIVETAG=HEAD
+
+REM Replace NATIVEEXT with tagged version number, like 1.1.0
+set NATIVEEXT=current
+
+REM Use tag or trunk
+REM NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/trunk
+set NATIVESVN=http://svn.apache.org/repos/asf/tomcat/connectors/tags/other/TOMCAT_NATIVE_1_1_3
+
+set NATIVEDIST=tomcat-native-%NATIVEEXT%
+@rmdir /S /Q %NATIVEDIST% 2>NUL
+svn export -r %NATIVETAG% %NATIVESVN%/jni/native %NATIVEDIST%
+
+set APRVER=1.2.7
+set SSLVER=0.9.8b
+
+REM Prebuild
+cd %NATIVEDIST%
+mkdir srclib
+cd srclib
+
+REM Download APR
+wget http://ftp.heanet.ie/mirrors/www.apache.org/dist/apr/apr-%APRVER%-win32-src.zip
+unzip -qo apr-%APRVER%-win32-src.zip
+@del /Q apr-%APRVER%-win32-src.zip
+
+REM Download OpenSSL
+wget http://www.openssl.org/source/openssl-%SSLVER%.tar.gz
+tar zxf openssl-%SSLVER%.tar.gz 2>NUL
+@del /Q openssl-%SSLVER%.tar.gz
+cd ..
+cd ..
+
+cp ./buildworld.bat %NATIVEDIST%/
+cp ./buildsvc.bat %NATIVEDIST%/
+cp ./NMAKEcommon.inc %NATIVEDIST%/build/
+cp ../NMAKEmakefile %NATIVEDIST%/
+cp ../srclib/apr/NMAKEmakefile %NATIVEDIST%/srclib/apr-%APRVER%/
+cp ../srclib/openssl/*.bat %NATIVEDIST%/srclib/openssl-%SSLVER%/
+
+REM zip -9rqo ../../%NATIVEDIST%.zip %NATIVEDIST%
+REM tar cfz ../../%NATIVEDIST%.tar.gz %NATIVEDIST%
+
+REM @rmdir /S /Q %NATIVEDIST%
+REM Instead packing move the prepared sources.
+@rmdir /S /Q ..\..\%NATIVEDIST% 2>NUL
+@mv %NATIVEDIST% ../../


Property changes on: labs/jbossweb/trunk/src/share/native/build/buildprep.bat
___________________________________________________________________
Name: svn:eol-style
   - native
   + CRLF

Modified: labs/jbossweb/trunk/src/share/native/build/buildsvc.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildsvc.bat	2006-05-23 07:33:59 UTC (rev 4367)
+++ labs/jbossweb/trunk/src/share/native/build/buildsvc.bat	2006-05-23 07:39:38 UTC (rev 4368)
@@ -1,46 +1,46 @@
-@echo off
-REM
-REM JBoss, the OpenSource J2EE webOS
-REM
-REM Distributable under LGPL license.
-REM See terms of license at gnu.org.
-REM
-REM
-REM @author Mladen Turk
-REM
-REM
-REM
-@if "%OS%" == "Windows_NT"  setlocal
-set MSVS8VC=C:\opt\MSVS8\VC\bin
-REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin
-
-
-@if not "%1" == "d" goto checkCPU
-@shift
-@rmdir /S /Q jbosssvc 2>NUL
-svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/windows/native/service/jbosssvc
-svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/share/native/build jbosssvc/build
-
-:checkCPU
-@if /i "%1" == "x86" goto cpuX86
-@if /i "%1" == "amd64" goto cpuAMD64
-@if /i "%1" == "ia64" goto cpuIA64
-echo Usage: buildsvc <CPU>
-goto cmdEnd
-
-:cpuX86
-set CPU=I386
-call %MSVS8VC%\vcvars32
-goto cmdBuild
-
-:cpuAMD64
-set CPU=AMD64
-call %MSVS8VC%\amd64\vcvarsamd64
-goto cmdBuild
-
-:cmdBuild
-cd jbosssvc
-nmake -f NMAKEMakefile
-nmake -f NMAKEMakefile install
-
-:cmdEnd
+@echo off
+REM
+REM JBoss, the OpenSource J2EE webOS
+REM
+REM Distributable under LGPL license.
+REM See terms of license at gnu.org.
+REM
+REM
+REM @author Mladen Turk
+REM
+REM
+REM
+@if "%OS%" == "Windows_NT"  setlocal
+set MSVS8VC=C:\opt\MSVS8\VC\bin
+REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin
+
+
+@if not "%1" == "d" goto checkCPU
+@shift
+@rmdir /S /Q jbosssvc 2>NUL
+svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/windows/native/service/jbosssvc
+svn export http://anonsvn.labs.jboss.com/labs/jbossweb/trunk/src/share/native/build jbosssvc/build
+
+:checkCPU
+@if /i "%1" == "x86" goto cpuX86
+@if /i "%1" == "amd64" goto cpuAMD64
+@if /i "%1" == "ia64" goto cpuIA64
+echo Usage: buildsvc <CPU>
+goto cmdEnd
+
+:cpuX86
+set CPU=I386
+call %MSVS8VC%\vcvars32
+goto cmdBuild
+
+:cpuAMD64
+set CPU=AMD64
+call %MSVS8VC%\amd64\vcvarsamd64
+goto cmdBuild
+
+:cmdBuild
+cd jbosssvc
+nmake -f NMAKEMakefile
+nmake -f NMAKEMakefile install
+
+:cmdEnd


Property changes on: labs/jbossweb/trunk/src/share/native/build/buildsvc.bat
___________________________________________________________________
Name: svn:eol-style
   - native
   + CRLF

Modified: labs/jbossweb/trunk/src/share/native/build/buildworld.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-23 07:33:59 UTC (rev 4367)
+++ labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-23 07:39:38 UTC (rev 4368)
@@ -1,83 +1,83 @@
-@echo off
-REM
-REM JBoss, the OpenSource J2EE webOS
-REM
-REM Distributable under LGPL license.
-REM See terms of license at gnu.org.
-REM
-REM
-REM @author Mladen Turk
-REM
-REM
-REM
-@if "%OS%" == "Windows_NT"  setlocal
-set MSVS8VC=C:\opt\msvs8\VC\bin
-REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin
-set PSDK5=C:\opt\psdk6
-REM PSDK5=C:\D\PSDK6
-
-set OPENSSLBIN=buildssl
-set OPENSSLVER=0.9.8b
-set APRVER=1.2.7
-set FLAVOR=DLL
-
-@if not "%1" == "sdk" goto checkFLAVOR
-shift
-set usesdk=1
-
-:checkFLAVOR
-@if /i "%1" == "dll" goto makeDLL
-set FLAVOR=STATIC
-goto checkCPU
-:makeDLL
-set FLAVOR=DLL
-
-:checkCPU
-@if /i "%2" == "x86" goto cpuX86
-@if /i "%2" == "amd64" goto cpuAMD64
-@if /i "%2" == "ia64" goto cpuIA64
-echo Usage: buildworld <CPU>
-goto cmdEnd
-
-:cpuX86
-set CPU=I386
-set OPENSSLBIN=buildsslasm %1
-@if "%usesdk%" == "1" (
-    call %PSDK5%\SetEnv /XP32 /RETAIL
-) else (
-    call %MSVS8VC%\vcvars32
-)
-goto cmdBuild
-
-:cpuAMD64
-set CPU=AMD64
-set OPENSSLBIN=buildsslamd64 %1
-@if "%usesdk%" == "1" (
-    call %PSDK5%\SetEnv /X64 /RETAIL
-) else (
-    call %MSVS8VC%\amd64\vcvarsamd64
-)
-goto cmdBuild
-
-:cpuIA64
-set CPU=IA64
-set OPENSSLBIN=buildsslia64 %1
-@if "%usesdk%" == "1" (
-    call %PSDK5%\SetEnv /SRV64 /RETAIL
-) else (
-    call %MSVS8VC%\amd64\vcvarsamd64
-)
-goto cmdBuild
-
-:cmdBuild
-cd srclib/openssl-%OPENSSLVER%
-call %OPENSSLBIN% %1
-cd ..
-cd apr-%APRVER%
-nmake -f NMAKEMakefile %FLAVOR%=1
-cd ..
-cd ..
-nmake -f NMAKEMakefile %FLAVOR%=1
-nmake -f NMAKEMakefile %FLAVOR%=1 install
-
-:cmdEnd
+@echo off
+REM
+REM JBoss, the OpenSource J2EE webOS
+REM
+REM Distributable under LGPL license.
+REM See terms of license at gnu.org.
+REM
+REM
+REM @author Mladen Turk
+REM
+REM
+REM
+@if "%OS%" == "Windows_NT"  setlocal
+set MSVS8VC=C:\opt\msvs8\VC\bin
+REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin
+set PSDK5=C:\opt\psdk6
+REM PSDK5=C:\D\PSDK6
+
+set OPENSSLBIN=buildssl
+set OPENSSLVER=0.9.8b
+set APRVER=1.2.7
+set FLAVOR=DLL
+
+@if not "%1" == "sdk" goto checkFLAVOR
+shift
+set usesdk=1
+
+:checkFLAVOR
+@if /i "%1" == "dll" goto makeDLL
+set FLAVOR=STATIC
+goto checkCPU
+:makeDLL
+set FLAVOR=DLL
+
+:checkCPU
+@if /i "%2" == "x86" goto cpuX86
+@if /i "%2" == "amd64" goto cpuAMD64
+@if /i "%2" == "ia64" goto cpuIA64
+echo Usage: buildworld <CPU>
+goto cmdEnd
+
+:cpuX86
+set CPU=I386
+set OPENSSLBIN=buildsslasm %1
+@if "%usesdk%" == "1" (
+    call %PSDK5%\SetEnv /XP32 /RETAIL
+) else (
+    call %MSVS8VC%\vcvars32
+)
+goto cmdBuild
+
+:cpuAMD64
+set CPU=AMD64
+set OPENSSLBIN=buildsslamd64 %1
+@if "%usesdk%" == "1" (
+    call %PSDK5%\SetEnv /X64 /RETAIL
+) else (
+    call %MSVS8VC%\amd64\vcvarsamd64
+)
+goto cmdBuild
+
+:cpuIA64
+set CPU=IA64
+set OPENSSLBIN=buildsslia64 %1
+@if "%usesdk%" == "1" (
+    call %PSDK5%\SetEnv /SRV64 /RETAIL
+) else (
+    call %MSVS8VC%\amd64\vcvarsamd64
+)
+goto cmdBuild
+
+:cmdBuild
+cd srclib/openssl-%OPENSSLVER%
+call %OPENSSLBIN% %1
+cd ..
+cd apr-%APRVER%
+nmake -f NMAKEMakefile %FLAVOR%=1
+cd ..
+cd ..
+nmake -f NMAKEMakefile %FLAVOR%=1
+nmake -f NMAKEMakefile %FLAVOR%=1 install
+
+:cmdEnd


Property changes on: labs/jbossweb/trunk/src/share/native/build/buildworld.bat
___________________________________________________________________
Name: svn:eol-style
   - native
   + CRLF

Modified: labs/jbossweb/trunk/src/share/native/php5servlet/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/share/native/php5servlet/NMAKEmakefile	2006-05-23 07:33:59 UTC (rev 4367)
+++ labs/jbossweb/trunk/src/share/native/php5servlet/NMAKEmakefile	2006-05-23 07:39:38 UTC (rev 4368)
@@ -1,87 +1,87 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ====================================================================
-#
-# NMAKEmakefile   Master PHP5 Servlet SAPI makefile.
-# Usage:
-#                 DEBUG=1   Build DEBUG version of TCN
-#
-# Originally contributed by Mladen Turk <mturk jboss.com>
-#
-# ====================================================================
-#
-
-TARGET = DLL
-BUILDIR_EXT = DLL
-PROJECT = php5servlet
-PHP5_LIB = php5ts.lib
-
-!include <../build/NMAKEcommon.inc>
-
-CFLAGS = $(CFLAGS) -DPHP5SERVLET_EXPORTS -DZTS -DZEND_WIN32 -DPHP_WIN32
-
-!IFDEF DEBUG
-CFLAGS = $(CFLAGS) -DZEND_DEBUG=1
-!ELSE
-CFLAGS = $(CFLAGS) -DZEND_DEBUG=0
-!ENDIF
-
-!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
-SRCDIR = .
-!ENDIF
-
-INCLUDES = -I$(SRCDIR)/include $(JAVA_INCLUDES)
-
-!IFNDEF WITH_PHP5
-WITH_PHP5 = ../srclib/php
-!ENDIF
-
-INCLUDES = $(INCLUDES) -I$(WITH_PHP5)/include/php -I$(WITH_PHP5)/include/php/win32 \
-	-I$(WITH_PHP5)/include/php/Zend -I$(WITH_PHP5)/include/php/main -I$(WITH_PHP5)/include/php/TSRM
-
-LDIRS = /libpath:"$(WITH_PHP5)/dev"
-LFLAGS = $(LFLAGS) $(PHP5_LIB)
-LFLAGS = $(LFLAGS) user32.lib
-
-PDBFLAGS = -Fo$(BUILDIR)\ -Fd$(BUILDIR)\$(PROJECT)-src
-OBJECTS = \
-	$(BUILDIR)\php5servlet.obj
-
-BUILDLIB = $(BUILDIR)\$(PROJECT).dll
-BUILDPDB = $(BUILDIR)\$(PROJECT).pdb
-BUILDRES = $(BUILDIR)\$(PROJECT).res
-BUILDMAN = $(BUILDLIB).manifest
-
-all : $(BUILDIR) $(BUILDLIB)
-
-$(BUILDIR) :
-	@$(MAKETARGET)
-
-{$(SRCDIR)}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-$(OBJECTS): $(SRCDIR)/*.c
-
-$(BUILDRES): $(SRCDIR)/php5servlet.rc
-	$(RC) $(RCFLAGS) /fo $(BUILDRES) $(SRCDIR)/php5servlet.rc
-
-$(BUILDLIB): $(BUILDIR) $(OBJECTS) $(BUILDRES)
-	$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDLIB)
-	IF EXIST $(BUILDMAN) \
-		mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDLIB);2
-
-clean:
-	@$(CLEANTARGET)
+# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ====================================================================
+#
+# NMAKEmakefile   Master PHP5 Servlet SAPI makefile.
+# Usage:
+#                 DEBUG=1   Build DEBUG version of TCN
+#
+# Originally contributed by Mladen Turk <mturk jboss.com>
+#
+# ====================================================================
+#
+
+TARGET = DLL
+BUILDIR_EXT = DLL
+PROJECT = php5servlet
+PHP5_LIB = php5ts.lib
+
+!include <../build/NMAKEcommon.inc>
+
+CFLAGS = $(CFLAGS) -DPHP5SERVLET_EXPORTS -DZTS -DZEND_WIN32 -DPHP_WIN32
+
+!IFDEF DEBUG
+CFLAGS = $(CFLAGS) -DZEND_DEBUG=1
+!ELSE
+CFLAGS = $(CFLAGS) -DZEND_DEBUG=0
+!ENDIF
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+INCLUDES = -I$(SRCDIR)/include $(JAVA_INCLUDES)
+
+!IFNDEF WITH_PHP5
+WITH_PHP5 = ../srclib/php
+!ENDIF
+
+INCLUDES = $(INCLUDES) -I$(WITH_PHP5)/include/php -I$(WITH_PHP5)/include/php/win32 \
+	-I$(WITH_PHP5)/include/php/Zend -I$(WITH_PHP5)/include/php/main -I$(WITH_PHP5)/include/php/TSRM
+
+LDIRS = /libpath:"$(WITH_PHP5)/dev"
+LFLAGS = $(LFLAGS) $(PHP5_LIB)
+LFLAGS = $(LFLAGS) user32.lib
+
+PDBFLAGS = -Fo$(BUILDIR)\ -Fd$(BUILDIR)\$(PROJECT)-src
+OBJECTS = \
+	$(BUILDIR)\php5servlet.obj
+
+BUILDLIB = $(BUILDIR)\$(PROJECT).dll
+BUILDPDB = $(BUILDIR)\$(PROJECT).pdb
+BUILDRES = $(BUILDIR)\$(PROJECT).res
+BUILDMAN = $(BUILDLIB).manifest
+
+all : $(BUILDIR) $(BUILDLIB)
+
+$(BUILDIR) :
+	@$(MAKETARGET)
+
+{$(SRCDIR)}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+$(OBJECTS): $(SRCDIR)/*.c
+
+$(BUILDRES): $(SRCDIR)/php5servlet.rc
+	$(RC) $(RCFLAGS) /fo $(BUILDRES) $(SRCDIR)/php5servlet.rc
+
+$(BUILDLIB): $(BUILDIR) $(OBJECTS) $(BUILDRES)
+	$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDLIB)
+	IF EXIST $(BUILDMAN) \
+		mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDLIB);2
+
+clean:
+	@$(CLEANTARGET)


Property changes on: labs/jbossweb/trunk/src/share/native/php5servlet/NMAKEmakefile
___________________________________________________________________
Name: svn:eol-style
   - native
   + CRLF

Modified: labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.rc
===================================================================
--- labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.rc	2006-05-23 07:33:59 UTC (rev 4367)
+++ labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.rc	2006-05-23 07:39:38 UTC (rev 4368)
@@ -1,80 +1,80 @@
-/*
- * JBoss, the OpenSource webOS
- *
- * Distributable under LGPL license.
- * See terms of license at gnu.org.
- */
-
-#include <windows.h>
-
-#define PRODUCT_VER_STRING "1.0.1.0\0"
-
-#define STR_COPYRIGHT       "Copyright  2006 JBoss inc. " \
-                            "or its licensors, as applicable."
-
-#define STR_LICENSE         "Distributable under LGPL license. " \
-                            "See terms of license at gnu.org."
-
-#define STR_COMPANY         "JBoss, Inc."
-#define STR_TRADEMARK       " JBoss Inc."
-#define STR_PRODUCT         "PHP5 Servlet SAPI"
-#define STR_VERISON         "1.0.1.0"
-#define CSV_VERISON         1,0,1,0
-
-#define PRIVATE_BUILD       0
-#define PRERELEASE_BUILD    0
-
-#if PRIVATE_BUILD
-#define STR_PRIVATE   "Initial Prerelease"
-#define STR_SPECIAL   "Basic functionality"
-#define STD_FILEFLAGS VS_FF_PRIVATEBUILD | VS_FF_SPECIALBUILD
-#else
-#define STD_FILEFLAGS 0x0L
-#endif
-
-#if RERELEASE_BUILD
-#define PSTD_FILEFLAGS STD_FILEFLAGS | VS_FF_PRERELEASE
-#else
-#define PSTD_FILEFLAGS STD_FILEFLAGS
-#endif
-
-#ifdef _DEBUG
-#define APP_FILEFLAGS STD_FILEFLAGS | VS_FF_DEBUG
-#else
-#define APP_FILEFLAGS STD_FILEFLAGS
-#endif
-
-1 VERSIONINFO
- FILEVERSION CSV_VERISON
- PRODUCTVERSION CSV_VERISON
- FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
- FILEFLAGS APP_FILEFLAGS
- FILEOS VOS_NT
- FILETYPE VFT_DLL
- FILESUBTYPE 0x0L
-BEGIN
-    BLOCK "StringFileInfo"
-    BEGIN
-        BLOCK "040904b0"
-        BEGIN
-            VALUE "Comments",  STR_LICENSE "\0"
-            VALUE "CompanyName", STR_COMPANY "\0"
-            VALUE "FileDescription", "PHP5 Servlet SAPI Module\0"
-            VALUE "FileVersion", STR_VERISON "\0"
-            VALUE "InternalName", "php5servlet"
-            VALUE "LegalCopyright", STR_COPYRIGHT "\0"
-            VALUE "LegalTrademarks", STR_TRADEMARK "\0"
-            VALUE "OriginalFilename", "php5servlet.dll"
-            VALUE "ProductName", STR_PRODUCT "\0"
-            VALUE "ProductVersion", STR_VERISON "\0"
-#if PRIVATE_BUILD
-            VALUE "PrivateBuild", STR_PRIVATE "\0"
-            VALUE "SpecialBuild", STR_SPECIAL "\0"
-#endif
-        END
-    END
-    BLOCK "VarFileInfo"
-    BEGIN
-        VALUE "Translation", 0x409, 1200
-    END
-END
+/*
+ * JBoss, the OpenSource webOS
+ *
+ * Distributable under LGPL license.
+ * See terms of license at gnu.org.
+ */
+
+#include <windows.h>
+
+#define PRODUCT_VER_STRING "1.0.1.0\0"
+
+#define STR_COPYRIGHT       "Copyright  2006 JBoss inc. " \
+                            "or its licensors, as applicable."
+
+#define STR_LICENSE         "Distributable under LGPL license. " \
+                            "See terms of license at gnu.org."
+
+#define STR_COMPANY         "JBoss, Inc."
+#define STR_TRADEMARK       " JBoss Inc."
+#define STR_PRODUCT         "PHP5 Servlet SAPI"
+#define STR_VERISON         "1.0.1.0"
+#define CSV_VERISON         1,0,1,0
+
+#define PRIVATE_BUILD       0
+#define PRERELEASE_BUILD    0
+
+#if PRIVATE_BUILD
+#define STR_PRIVATE   "Initial Prerelease"
+#define STR_SPECIAL   "Basic functionality"
+#define STD_FILEFLAGS VS_FF_PRIVATEBUILD | VS_FF_SPECIALBUILD
+#else
+#define STD_FILEFLAGS 0x0L
+#endif
+
+#if RERELEASE_BUILD
+#define PSTD_FILEFLAGS STD_FILEFLAGS | VS_FF_PRERELEASE
+#else
+#define PSTD_FILEFLAGS STD_FILEFLAGS
+#endif
+
+#ifdef _DEBUG
+#define APP_FILEFLAGS STD_FILEFLAGS | VS_FF_DEBUG
+#else
+#define APP_FILEFLAGS STD_FILEFLAGS
+#endif
+
+1 VERSIONINFO
+ FILEVERSION CSV_VERISON
+ PRODUCTVERSION CSV_VERISON
+ FILEFLAGSMASK VS_FFI_FILEFLAGSMASK
+ FILEFLAGS APP_FILEFLAGS
+ FILEOS VOS_NT
+ FILETYPE VFT_DLL
+ FILESUBTYPE 0x0L
+BEGIN
+    BLOCK "StringFileInfo"
+    BEGIN
+        BLOCK "040904b0"
+        BEGIN
+            VALUE "Comments",  STR_LICENSE "\0"
+            VALUE "CompanyName", STR_COMPANY "\0"
+            VALUE "FileDescription", "PHP5 Servlet SAPI Module\0"
+            VALUE "FileVersion", STR_VERISON "\0"
+            VALUE "InternalName", "php5servlet"
+            VALUE "LegalCopyright", STR_COPYRIGHT "\0"
+            VALUE "LegalTrademarks", STR_TRADEMARK "\0"
+            VALUE "OriginalFilename", "php5servlet.dll"
+            VALUE "ProductName", STR_PRODUCT "\0"
+            VALUE "ProductVersion", STR_VERISON "\0"
+#if PRIVATE_BUILD
+            VALUE "PrivateBuild", STR_PRIVATE "\0"
+            VALUE "SpecialBuild", STR_SPECIAL "\0"
+#endif
+        END
+    END
+    BLOCK "VarFileInfo"
+    BEGIN
+        VALUE "Translation", 0x409, 1200
+    END
+END


Property changes on: labs/jbossweb/trunk/src/share/native/php5servlet/php5servlet.rc
___________________________________________________________________
Name: svn:eol-style
   - native
   + CRLF

Modified: labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile	2006-05-23 07:33:59 UTC (rev 4367)
+++ labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile	2006-05-23 07:39:38 UTC (rev 4368)
@@ -1,213 +1,213 @@
-# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ====================================================================
-#
-# NMAKEmakefile   Master APR makefile.
-# Usage:
-#                 DLL=1     Build DLL version
-#                 DEBUG=1   Build DEBUG version of APR
-#
-# Originally contributed by Mladen Turk <mturk jboss.com>
-#
-# ====================================================================
-#
-
-!IFDEF DLL
-CFLAGS = -DAPR_DECLARE_EXPORT $(CFLAGS)
-TARGET = DLL
-PROJECT = libapr-1
-!ELSE
-CFLAGS = -DAPR_DECLARE_STATIC $(CFLAGS)
-TARGET = LIB
-PROJECT = apr-1
-!ENDIF
-
-!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
-SRCDIR = .
-!ENDIF
-
-!include <../../build/NMAKEcommon.inc>
-
-INCLUDES = -I$(SRCDIR)/include -I$(SRCDIR)/include/arch -I$(SRCDIR)/include/arch/win32 -I$(SRCDIR)/include/arch/unix
-PDBFLAGS = -Fo$(BUILDIR)\ -Fd$(BUILDIR)\$(PROJECT)-src
-OBJECTS = \
-	$(BUILDIR)\apr_atomic.obj \
-	$(BUILDIR)\dso.obj \
-	$(BUILDIR)\copy.obj \
-	$(BUILDIR)\dir.obj \
-	$(BUILDIR)\fileacc.obj \
-	$(BUILDIR)\filedup.obj \
-	$(BUILDIR)\filepath.obj \
-	$(BUILDIR)\filepath_util.obj \
-	$(BUILDIR)\filestat.obj \
-	$(BUILDIR)\filesys.obj \
-	$(BUILDIR)\flock.obj \
-	$(BUILDIR)\fullrw.obj \
-	$(BUILDIR)\mktemp.obj \
-	$(BUILDIR)\open.obj \
-	$(BUILDIR)\pipe.obj \
-	$(BUILDIR)\readwrite.obj \
-	$(BUILDIR)\seek.obj \
-	$(BUILDIR)\tempdir.obj \
-	$(BUILDIR)\proc_mutex.obj \
-	$(BUILDIR)\thread_cond.obj \
-	$(BUILDIR)\thread_mutex.obj \
-	$(BUILDIR)\thread_rwlock.obj \
-	$(BUILDIR)\apr_pools.obj \
-	$(BUILDIR)\charset.obj \
-	$(BUILDIR)\env.obj \
-	$(BUILDIR)\errorcodes.obj \
-	$(BUILDIR)\getopt.obj \
-	$(BUILDIR)\internal.obj \
-	$(BUILDIR)\misc.obj \
-	$(BUILDIR)\otherchild.obj \
-	$(BUILDIR)\rand.obj \
-	$(BUILDIR)\start.obj \
-	$(BUILDIR)\utf8.obj \
-	$(BUILDIR)\version.obj \
-	$(BUILDIR)\common.obj \
-	$(BUILDIR)\mmap.obj \
-	$(BUILDIR)\inet_ntop.obj \
-	$(BUILDIR)\inet_pton.obj \
-	$(BUILDIR)\select.obj \
-	$(BUILDIR)\multicast.obj \
-	$(BUILDIR)\sendrecv.obj \
-	$(BUILDIR)\sockaddr.obj \
-	$(BUILDIR)\sockets.obj \
-	$(BUILDIR)\sockopt.obj \
-	$(BUILDIR)\apr_getpass.obj \
-	$(BUILDIR)\apr_random.obj \
-	$(BUILDIR)\sha2.obj \
-	$(BUILDIR)\sha2_glue.obj \
-	$(BUILDIR)\shm.obj \
-	$(BUILDIR)\apr_cpystrn.obj \
-	$(BUILDIR)\apr_fnmatch.obj \
-	$(BUILDIR)\apr_snprintf.obj \
-	$(BUILDIR)\apr_strings.obj \
-	$(BUILDIR)\apr_strnatcmp.obj \
-	$(BUILDIR)\apr_strtok.obj \
-	$(BUILDIR)\apr_hash.obj \
-	$(BUILDIR)\apr_tables.obj \
-	$(BUILDIR)\proc.obj \
-	$(BUILDIR)\signals.obj \
-	$(BUILDIR)\thread.obj \
-	$(BUILDIR)\threadpriv.obj \
-	$(BUILDIR)\access.obj \
-	$(BUILDIR)\time.obj \
-	$(BUILDIR)\timestr.obj \
-	$(BUILDIR)\groupinfo.obj \
-	$(BUILDIR)\userinfo.obj
-
-
-!IFDEF DLL
-BUILDLIB = $(BUILDIR)\$(PROJECT).dll
-BUILDPDB = $(BUILDIR)\$(PROJECT).pdb
-BUILDRES = $(BUILDIR)\$(PROJECT).res
-BUILDMAN = $(BUILDLIB).manifest
-!ELSE
-BUILDLIB = $(BUILDIR)\$(PROJECT).lib
-!ENDIF
-
-all : $(BUILDIR) $(BUILDLIB)
-
-$(BUILDIR) :
-	@$(MAKETARGET)
-
-$(SRCDIR)/include/apr.h: $(SRCDIR)/include/apr.hw
-	<<nmaketmp.bat
-	@echo off
-	@type $(SRCDIR)\include\apr.hw > $(SRCDIR)\include\apr.h
-<<
-
-{$(SRCDIR)/atomic/win32}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)/dso/win32}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)/file_io/unix}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)/file_io/win32}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)/locks/win32}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)/memory/unix}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)/misc/unix}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)/misc/win32}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)/mmap/unix}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)/mmap/win32}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)/network_io/unix}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)/network_io/win32}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)/passwd}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)/poll/unix}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)/random/unix}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)/shmem/win32}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)/strings}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)/tables}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)/threadproc/win32}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)/time/win32}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-{$(SRCDIR)/user/win32}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-$(OBJECTS): $(SRCDIR)/include/*.h $(SRCDIR)/include/arch/*.h $(SRCDIR)/include/arch/win32/*.h $(SRCDIR)/include/arch/unix/*.h
-
-!IFDEF DLL
-$(BUILDRES): libapr.rc $(SRCDIR)/include/*.h
-	$(RC) $(RCFLAGS) /i "$(SRCDIR)/include" /d "APR_VERSION_ONLY" /fo $(BUILDRES) libapr.rc
-$(BUILDLIB): $(BUILDIR) $(SRCDIR)/include/apr.h $(OBJECTS) $(BUILDRES)
-	$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) /pdb:$(BUILDPDB) /out:$(BUILDLIB)
-	IF EXIST $(BUILDMAN) \
-		mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDLIB);2
-!ELSE
-$(BUILDLIB): $(BUILDIR) $(SRCDIR)/include/apr.h $(OBJECTS)
-	$(LINK) $(LFLAGS) $(OBJECTS) /out:$(BUILDLIB)
-!ENDIF
-
-clean:
-	@$(CLEANTARGET)
+# Copyright 2001-2006 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ====================================================================
+#
+# NMAKEmakefile   Master APR makefile.
+# Usage:
+#                 DLL=1     Build DLL version
+#                 DEBUG=1   Build DEBUG version of APR
+#
+# Originally contributed by Mladen Turk <mturk jboss.com>
+#
+# ====================================================================
+#
+
+!IFDEF DLL
+CFLAGS = -DAPR_DECLARE_EXPORT $(CFLAGS)
+TARGET = DLL
+PROJECT = libapr-1
+!ELSE
+CFLAGS = -DAPR_DECLARE_STATIC $(CFLAGS)
+TARGET = LIB
+PROJECT = apr-1
+!ENDIF
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+!include <../../build/NMAKEcommon.inc>
+
+INCLUDES = -I$(SRCDIR)/include -I$(SRCDIR)/include/arch -I$(SRCDIR)/include/arch/win32 -I$(SRCDIR)/include/arch/unix
+PDBFLAGS = -Fo$(BUILDIR)\ -Fd$(BUILDIR)\$(PROJECT)-src
+OBJECTS = \
+	$(BUILDIR)\apr_atomic.obj \
+	$(BUILDIR)\dso.obj \
+	$(BUILDIR)\copy.obj \
+	$(BUILDIR)\dir.obj \
+	$(BUILDIR)\fileacc.obj \
+	$(BUILDIR)\filedup.obj \
+	$(BUILDIR)\filepath.obj \
+	$(BUILDIR)\filepath_util.obj \
+	$(BUILDIR)\filestat.obj \
+	$(BUILDIR)\filesys.obj \
+	$(BUILDIR)\flock.obj \
+	$(BUILDIR)\fullrw.obj \
+	$(BUILDIR)\mktemp.obj \
+	$(BUILDIR)\open.obj \
+	$(BUILDIR)\pipe.obj \
+	$(BUILDIR)\readwrite.obj \
+	$(BUILDIR)\seek.obj \
+	$(BUILDIR)\tempdir.obj \
+	$(BUILDIR)\proc_mutex.obj \
+	$(BUILDIR)\thread_cond.obj \
+	$(BUILDIR)\thread_mutex.obj \
+	$(BUILDIR)\thread_rwlock.obj \
+	$(BUILDIR)\apr_pools.obj \
+	$(BUILDIR)\charset.obj \
+	$(BUILDIR)\env.obj \
+	$(BUILDIR)\errorcodes.obj \
+	$(BUILDIR)\getopt.obj \
+	$(BUILDIR)\internal.obj \
+	$(BUILDIR)\misc.obj \
+	$(BUILDIR)\otherchild.obj \
+	$(BUILDIR)\rand.obj \
+	$(BUILDIR)\start.obj \
+	$(BUILDIR)\utf8.obj \
+	$(BUILDIR)\version.obj \
+	$(BUILDIR)\common.obj \
+	$(BUILDIR)\mmap.obj \
+	$(BUILDIR)\inet_ntop.obj \
+	$(BUILDIR)\inet_pton.obj \
+	$(BUILDIR)\select.obj \
+	$(BUILDIR)\multicast.obj \
+	$(BUILDIR)\sendrecv.obj \
+	$(BUILDIR)\sockaddr.obj \
+	$(BUILDIR)\sockets.obj \
+	$(BUILDIR)\sockopt.obj \
+	$(BUILDIR)\apr_getpass.obj \
+	$(BUILDIR)\apr_random.obj \
+	$(BUILDIR)\sha2.obj \
+	$(BUILDIR)\sha2_glue.obj \
+	$(BUILDIR)\shm.obj \
+	$(BUILDIR)\apr_cpystrn.obj \
+	$(BUILDIR)\apr_fnmatch.obj \
+	$(BUILDIR)\apr_snprintf.obj \
+	$(BUILDIR)\apr_strings.obj \
+	$(BUILDIR)\apr_strnatcmp.obj \
+	$(BUILDIR)\apr_strtok.obj \
+	$(BUILDIR)\apr_hash.obj \
+	$(BUILDIR)\apr_tables.obj \
+	$(BUILDIR)\proc.obj \
+	$(BUILDIR)\signals.obj \
+	$(BUILDIR)\thread.obj \
+	$(BUILDIR)\threadpriv.obj \
+	$(BUILDIR)\access.obj \
+	$(BUILDIR)\time.obj \
+	$(BUILDIR)\timestr.obj \
+	$(BUILDIR)\groupinfo.obj \
+	$(BUILDIR)\userinfo.obj
+
+
+!IFDEF DLL
+BUILDLIB = $(BUILDIR)\$(PROJECT).dll
+BUILDPDB = $(BUILDIR)\$(PROJECT).pdb
+BUILDRES = $(BUILDIR)\$(PROJECT).res
+BUILDMAN = $(BUILDLIB).manifest
+!ELSE
+BUILDLIB = $(BUILDIR)\$(PROJECT).lib
+!ENDIF
+
+all : $(BUILDIR) $(BUILDLIB)
+
+$(BUILDIR) :
+	@$(MAKETARGET)
+
+$(SRCDIR)/include/apr.h: $(SRCDIR)/include/apr.hw
+	<<nmaketmp.bat
+	@echo off
+	@type $(SRCDIR)\include\apr.hw > $(SRCDIR)\include\apr.h
+<<
+
+{$(SRCDIR)/atomic/win32}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/dso/win32}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/file_io/unix}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/file_io/win32}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/locks/win32}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/memory/unix}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/misc/unix}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/misc/win32}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/mmap/unix}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/mmap/win32}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/network_io/unix}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/network_io/win32}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/passwd}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/poll/unix}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/random/unix}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/shmem/win32}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/strings}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/tables}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/threadproc/win32}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/time/win32}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+{$(SRCDIR)/user/win32}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+$(OBJECTS): $(SRCDIR)/include/*.h $(SRCDIR)/include/arch/*.h $(SRCDIR)/include/arch/win32/*.h $(SRCDIR)/include/arch/unix/*.h
+
+!IFDEF DLL
+$(BUILDRES): libapr.rc $(SRCDIR)/include/*.h
+	$(RC) $(RCFLAGS) /i "$(SRCDIR)/include" /d "APR_VERSION_ONLY" /fo $(BUILDRES) libapr.rc
+$(BUILDLIB): $(BUILDIR) $(SRCDIR)/include/apr.h $(OBJECTS) $(BUILDRES)
+	$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) /pdb:$(BUILDPDB) /out:$(BUILDLIB)
+	IF EXIST $(BUILDMAN) \
+		mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDLIB);2
+!ELSE
+$(BUILDLIB): $(BUILDIR) $(SRCDIR)/include/apr.h $(OBJECTS)
+	$(LINK) $(LFLAGS) $(OBJECTS) /out:$(BUILDLIB)
+!ENDIF
+
+clean:
+	@$(CLEANTARGET)


Property changes on: labs/jbossweb/trunk/src/share/native/srclib/apr/NMAKEmakefile
___________________________________________________________________
Name: svn:eol-style
   - native
   + CRLF

Modified: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildssl.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildssl.bat	2006-05-23 07:33:59 UTC (rev 4367)
+++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildssl.bat	2006-05-23 07:39:38 UTC (rev 4368)
@@ -1,31 +1,31 @@
-@echo off
-REM
-REM JBoss, the OpenSource J2EE webOS
-REM
-REM Distributable under LGPL license.
-REM See terms of license at gnu.org.
-REM
-REM
-REM @author Mladen Turk
-REM @version $Revision$, $Date$
-REM
-REM
-REM call vsvars32
-REM
-@if "%OS%" == "Windows_NT"  setlocal
-@rmdir /S /Q out32
-@rmdir /S /Q out32dll
-@rmdir /S /Q tmp32
-@rmdir /S /Q tmp32dll
-
-perl Configure VC-NT
-call ms\do_nt
-
-@if "%1" == "dll" goto DLL
-@goto LIB
-:DLL
-nmake -f ms\ntdll.mak
-@goto END
-:LIB
-nmake -f ms\nt.mak
-:END
+@echo off
+REM
+REM JBoss, the OpenSource J2EE webOS
+REM
+REM Distributable under LGPL license.
+REM See terms of license at gnu.org.
+REM
+REM
+REM @author Mladen Turk
+REM @version $Revision$, $Date$
+REM
+REM
+REM call vsvars32
+REM
+@if "%OS%" == "Windows_NT"  setlocal
+@rmdir /S /Q out32
+@rmdir /S /Q out32dll
+@rmdir /S /Q tmp32
+@rmdir /S /Q tmp32dll
+
+perl Configure VC-NT
+call ms\do_nt
+
+@if "%1" == "dll" goto DLL
+@goto LIB
+:DLL
+nmake -f ms\ntdll.mak
+@goto END
+:LIB
+nmake -f ms\nt.mak
+:END


Property changes on: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildssl.bat
___________________________________________________________________
Name: svn:eol-style
   - native
   + CRLF

Modified: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat	2006-05-23 07:33:59 UTC (rev 4367)
+++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat	2006-05-23 07:39:38 UTC (rev 4368)
@@ -1,31 +1,31 @@
-@echo off
-REM
-REM JBoss, the OpenSource J2EE webOS
-REM
-REM Distributable under LGPL license.
-REM See terms of license at gnu.org.
-REM
-REM
-REM @author Mladen Turk
-REM @version $Revision$, $Date$
-REM
-REM
-REM call vsvars32
-REM
-@if "%OS%" == "Windows_NT"  setlocal
-@rmdir /S /Q out32
-@rmdir /S /Q out32dll
-@rmdir /S /Q tmp32
-@rmdir /S /Q tmp32dll
-
-perl Configure VC-WIN64A
-call ms\do_win64a
-
-@if "%1" == "dll" goto DLL
-@goto LIB
-:DLL
-nmake -f ms\ntdll.mak
-@goto END
-:LIB
-nmake -f ms\nt.mak
-:END
+@echo off
+REM
+REM JBoss, the OpenSource J2EE webOS
+REM
+REM Distributable under LGPL license.
+REM See terms of license at gnu.org.
+REM
+REM
+REM @author Mladen Turk
+REM @version $Revision$, $Date$
+REM
+REM
+REM call vsvars32
+REM
+@if "%OS%" == "Windows_NT"  setlocal
+@rmdir /S /Q out32
+@rmdir /S /Q out32dll
+@rmdir /S /Q tmp32
+@rmdir /S /Q tmp32dll
+
+perl Configure VC-WIN64A
+call ms\do_win64a
+
+@if "%1" == "dll" goto DLL
+@goto LIB
+:DLL
+nmake -f ms\ntdll.mak
+@goto END
+:LIB
+nmake -f ms\nt.mak
+:END


Property changes on: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslamd64.bat
___________________________________________________________________
Name: svn:eol-style
   - native
   + CRLF

Modified: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat	2006-05-23 07:33:59 UTC (rev 4367)
+++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat	2006-05-23 07:39:38 UTC (rev 4368)
@@ -1,31 +1,31 @@
-@echo off
-REM
-REM JBoss, the OpenSource J2EE webOS
-REM
-REM Distributable under LGPL license.
-REM See terms of license at gnu.org.
-REM
-REM
-REM @author Mladen Turk
-REM @version $Revision$, $Date$
-REM
-REM
-REM call vsvars32
-REM
-@if "%OS%" == "Windows_NT"  setlocal
-@rmdir /S /Q out32
-@rmdir /S /Q out32dll
-@rmdir /S /Q tmp32
-@rmdir /S /Q tmp32dll
-
-perl Configure VC-NT
-call ms\do_masm
-
-@if "%1" == "dll" goto DLL
-@goto LIB
-:DLL
-nmake -f ms\ntdll.mak
-@goto END
-:LIB
-nmake -f ms\nt.mak
-:END
+@echo off
+REM
+REM JBoss, the OpenSource J2EE webOS
+REM
+REM Distributable under LGPL license.
+REM See terms of license at gnu.org.
+REM
+REM
+REM @author Mladen Turk
+REM @version $Revision$, $Date$
+REM
+REM
+REM call vsvars32
+REM
+@if "%OS%" == "Windows_NT"  setlocal
+@rmdir /S /Q out32
+@rmdir /S /Q out32dll
+@rmdir /S /Q tmp32
+@rmdir /S /Q tmp32dll
+
+perl Configure VC-NT
+call ms\do_masm
+
+@if "%1" == "dll" goto DLL
+@goto LIB
+:DLL
+nmake -f ms\ntdll.mak
+@goto END
+:LIB
+nmake -f ms\nt.mak
+:END


Property changes on: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslasm.bat
___________________________________________________________________
Name: svn:eol-style
   - native
   + CRLF

Modified: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat	2006-05-23 07:33:59 UTC (rev 4367)
+++ labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat	2006-05-23 07:39:38 UTC (rev 4368)
@@ -1,31 +1,31 @@
-@echo off
-REM
-REM JBoss, the OpenSource J2EE webOS
-REM
-REM Distributable under LGPL license.
-REM See terms of license at gnu.org.
-REM
-REM
-REM @author Mladen Turk
-REM @version $Revision$, $Date$
-REM
-REM
-REM call vsvars32
-REM
-@if "%OS%" == "Windows_NT"  setlocal
-@rmdir /S /Q out32
-@rmdir /S /Q out32dll
-@rmdir /S /Q tmp32
-@rmdir /S /Q tmp32dll
-
-perl Configure VC-WIN64I
-call ms\do_win64i
-
-@if "%1" == "dll" goto DLL
-@goto LIB
-:DLL
-nmake -f ms\ntdll.mak
-@goto END
-:LIB
-nmake -f ms\nt.mak
-:END
+@echo off
+REM
+REM JBoss, the OpenSource J2EE webOS
+REM
+REM Distributable under LGPL license.
+REM See terms of license at gnu.org.
+REM
+REM
+REM @author Mladen Turk
+REM @version $Revision$, $Date$
+REM
+REM
+REM call vsvars32
+REM
+@if "%OS%" == "Windows_NT"  setlocal
+@rmdir /S /Q out32
+@rmdir /S /Q out32dll
+@rmdir /S /Q tmp32
+@rmdir /S /Q tmp32dll
+
+perl Configure VC-WIN64I
+call ms\do_win64i
+
+@if "%1" == "dll" goto DLL
+@goto LIB
+:DLL
+nmake -f ms\ntdll.mak
+@goto END
+:LIB
+nmake -f ms\nt.mak
+:END


Property changes on: labs/jbossweb/trunk/src/share/native/srclib/openssl/buildsslia64.bat
___________________________________________________________________
Name: svn:eol-style
   - native
   + CRLF

Modified: labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile
===================================================================
--- labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile	2006-05-23 07:33:59 UTC (rev 4367)
+++ labs/jbossweb/trunk/src/windows/native/service/jbosssvc/NMAKEmakefile	2006-05-23 07:39:38 UTC (rev 4368)
@@ -1,71 +1,71 @@
-# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
-# applicable.
-#
-# Licensed under the Apache License, Version 2.0 (the "License");
-# you may not use this file except in compliance with the License.
-# You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-#
-# ====================================================================
-#
-# NMAKEmakefile   JBoss Service Make file.
-# Usage:
-#                 DEBUG=1   Build DEBUG version
-#
-# Originally contributed by Mladen Turk <mturk jboss.com>
-#
-# ====================================================================
-#
-
-TARGET = EXE
-PROJECT = jbosssvc
-!include <build/NMAKEcommon.inc>
-
-!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
-SRCDIR = .
-!ENDIF
-
-LFLAGS = $(LFLAGS) user32.lib
-
-PDBFLAGS = -Fo$(BUILDIR)\ -Fd$(BUILDIR)\$(PROJECT)-src
-OBJECTS = \
-	$(BUILDIR)\jboss.obj
-
-BUILDEXE = $(BUILDIR)\$(PROJECT).exe
-BUILDPDB = $(BUILDIR)\$(PROJECT).pdb
-BUILDRES = $(BUILDIR)\$(PROJECT).res
-BUILDMAN = $(BUILDLIB).manifest
-
-all : $(BUILDIR) $(BUILDEXE)
-
-$(BUILDIR) :
-	@$(MAKETARGET)
-
-{$(SRCDIR)}.c{$(BUILDIR)}.obj:
-	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
-
-$(BUILDRES): $(SRCDIR)/jboss.rc
-	$(RC) $(RCFLAGS) /fo $(BUILDRES) $(SRCDIR)/jboss.rc
-
-$(BUILDEXE): $(BUILDIR) $(OBJECTS) $(BUILDRES)
-	$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES) $(LIBS) $(LDIRS) /pdb:$(BUILDPDB) /out:$(BUILDEXE)
-	IF EXIST $(BUILDMAN) \
-		mt -nologo -manifest $(BUILDMAN) -outputresource:$(BUILDLIB);1
-
-clean:
-	@$(CLEANTARGET)
-
-!IFNDEF INSTALLDIR
-INSTALLDIR = ../../native-builds/windows-%CPU%/bin
-!ENDIF
-
-install: all
-    @gmkdir -p $(INSTALLDIR)
-	@cp -f -t $(INSTALLDIR) $(BUILDEXE)
+# Copyright 2001-2005 The Apache Software Foundation or its licensors, as
+# applicable.
+#
+# Licensed under the Apache License, Version 2.0 (the "License");
+# you may not use this file except in compliance with the License.
+# You may obtain a copy of the License at
+#
+#     http://www.apache.org/licenses/LICENSE-2.0
+#
+# Unless required by applicable law or agreed to in writing, software
+# distributed under the License is distributed on an "AS IS" BASIS,
+# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+# See the License for the specific language governing permissions and
+# limitations under the License.
+#
+# ====================================================================
+#
+# NMAKEmakefile   JBoss Service Make file.
+# Usage:
+#                 DEBUG=1   Build DEBUG version
+#
+# Originally contributed by Mladen Turk <mturk jboss.com>
+#
+# ====================================================================
+#
+
+TARGET = EXE
+PROJECT = jbosssvc
+!include <build/NMAKEcommon.inc>
+
+!IF !DEFINED(SRCDIR) || "$(SRCDIR)" == ""
+SRCDIR = .
+!ENDIF
+
+LFLAGS = $(LFLAGS) user32.lib
+
+PDBFLAGS = -Fo$(BUILDIR)\ -Fd$(BUILDIR)\$(PROJECT)-src
+OBJECTS = \
+	$(BUILDIR)\jboss.obj
+
+BUILDEXE = $(BUILDIR)\$(PROJECT).exe
+BUILDPDB = $(BUILDIR)\$(PROJECT).pdb
+BUILDRES = $(BUILDIR)\$(PROJECT).res
+BUILDMAN = $(BUILDLIB).manifest
+
+all : $(BUILDIR) $(BUILDEXE)
+
+$(BUILDIR) :
+	@$(MAKETARGET)
+
+{$(SRCDIR)}.c{$(BUILDIR)}.obj:
+	$(CC) $(CFLAGS) $(INCLUDES) $(PDBFLAGS) $<
+
+$(BUILDRES): $(SRCDIR)/jboss.rc
+	$(RC) $(RCFLAGS) /fo $(BUILDRES) $(SRCDIR)/jboss.rc
+
+$(BUILDEXE): $(BUILDIR) $(OBJECTS) $(BUILDRES)
+	$(LINK) $(LFLAGS) $(OBJECTS) $(BUILDRES...
 
[truncated message content]

[Jboss-svn-commits] JBL Code SVN: r4367 - in labs/jbossweb/trunk: src/share/resources/ROOT.war src/share/resources/ROOT.war/images src/share/resources/bin src/windows/native/service/jbosssvc xdocs/images xdocs/images/benchmarks xdocs/images/design xdocs/sources

From: <jbo...@li...> - 2006-05-23 07:34:35

Author: mla...@jb...
Date: 2006-05-23 03:33:59 -0400 (Tue, 23 May 2006)
New Revision: 4367

Modified:
   labs/jbossweb/trunk/src/share/resources/ROOT.war/favicon.ico
   labs/jbossweb/trunk/src/share/resources/ROOT.war/images/jboss_ics.gif
   labs/jbossweb/trunk/src/share/resources/ROOT.war/images/jbosslogo.gif
   labs/jbossweb/trunk/src/share/resources/ROOT.war/images/jbossweblogo.gif
   labs/jbossweb/trunk/src/share/resources/ROOT.war/images/jbweb_pb.gif
   labs/jbossweb/trunk/src/share/resources/ROOT.war/images/openssl_ics.gif
   labs/jbossweb/trunk/src/share/resources/ROOT.war/images/tomcat_pb.gif
   labs/jbossweb/trunk/src/share/resources/ROOT.war/images/void.gif
   labs/jbossweb/trunk/src/share/resources/ROOT.war/logo.gif
   labs/jbossweb/trunk/src/share/resources/bin/jboss.ico
   labs/jbossweb/trunk/src/windows/native/service/jbosssvc/MSG00001.bin
   labs/jbossweb/trunk/src/windows/native/service/jbosssvc/jboss.ico
   labs/jbossweb/trunk/xdocs/images/add.gif
   labs/jbossweb/trunk/xdocs/images/benchmarks/10kssl.png
   labs/jbossweb/trunk/xdocs/images/benchmarks/1kssl.png
   labs/jbossweb/trunk/xdocs/images/benchmarks/apr.png
   labs/jbossweb/trunk/xdocs/images/benchmarks/jio.png
   labs/jbossweb/trunk/xdocs/images/benchmarks/ka50.png
   labs/jbossweb/trunk/xdocs/images/benchmarks/ka50log.png
   labs/jbossweb/trunk/xdocs/images/benchmarks/kat.png
   labs/jbossweb/trunk/xdocs/images/benchmarks/kkt.png
   labs/jbossweb/trunk/xdocs/images/benchmarks/ssl1.png
   labs/jbossweb/trunk/xdocs/images/benchmarks/ssl1nl.png
   labs/jbossweb/trunk/xdocs/images/code.gif
   labs/jbossweb/trunk/xdocs/images/design.gif
   labs/jbossweb/trunk/xdocs/images/design/acceptflowchart.png
   labs/jbossweb/trunk/xdocs/images/design/configlayout.png
   labs/jbossweb/trunk/xdocs/images/design/jbosswebarch.png
   labs/jbossweb/trunk/xdocs/images/design/jbosswebblockda.png
   labs/jbossweb/trunk/xdocs/images/design/netoodiag.png
   labs/jbossweb/trunk/xdocs/images/design/procdiag.png
   labs/jbossweb/trunk/xdocs/images/design/sendfileflowchart.png
   labs/jbossweb/trunk/xdocs/images/design/tcnativeblockda.png
   labs/jbossweb/trunk/xdocs/images/docs.gif
   labs/jbossweb/trunk/xdocs/images/downg.gif
   labs/jbossweb/trunk/xdocs/images/downr.gif
   labs/jbossweb/trunk/xdocs/images/excl.gif
   labs/jbossweb/trunk/xdocs/images/feather.gif
   labs/jbossweb/trunk/xdocs/images/fix.gif
   labs/jbossweb/trunk/xdocs/images/jboss_ics.gif
   labs/jbossweb/trunk/xdocs/images/jbosslogo.gif
   labs/jbossweb/trunk/xdocs/images/jbossweblogo.gif
   labs/jbossweb/trunk/xdocs/images/jbweb_pb.gif
   labs/jbossweb/trunk/xdocs/images/lock.gif
   labs/jbossweb/trunk/xdocs/images/no.gif
   labs/jbossweb/trunk/xdocs/images/ok.gif
   labs/jbossweb/trunk/xdocs/images/openssl_ics.gif
   labs/jbossweb/trunk/xdocs/images/printer.gif
   labs/jbossweb/trunk/xdocs/images/rank0.gif
   labs/jbossweb/trunk/xdocs/images/rank1.gif
   labs/jbossweb/trunk/xdocs/images/rank10.gif
   labs/jbossweb/trunk/xdocs/images/rank2.gif
   labs/jbossweb/trunk/xdocs/images/rank3.gif
   labs/jbossweb/trunk/xdocs/images/rank4.gif
   labs/jbossweb/trunk/xdocs/images/rank5.gif
   labs/jbossweb/trunk/xdocs/images/rank6.gif
   labs/jbossweb/trunk/xdocs/images/rank7.gif
   labs/jbossweb/trunk/xdocs/images/rank8.gif
   labs/jbossweb/trunk/xdocs/images/rank9.gif
   labs/jbossweb/trunk/xdocs/images/tomcat.gif
   labs/jbossweb/trunk/xdocs/images/tomcat_pb.gif
   labs/jbossweb/trunk/xdocs/images/update.gif
   labs/jbossweb/trunk/xdocs/images/upg.gif
   labs/jbossweb/trunk/xdocs/images/upr.gif
   labs/jbossweb/trunk/xdocs/images/void.gif
   labs/jbossweb/trunk/xdocs/images/x.gif
   labs/jbossweb/trunk/xdocs/sources/acceptflowchart.vsd
   labs/jbossweb/trunk/xdocs/sources/configlayout.vsd
   labs/jbossweb/trunk/xdocs/sources/jbosswebarch.vsd
   labs/jbossweb/trunk/xdocs/sources/jbosswebblockda.vsd
   labs/jbossweb/trunk/xdocs/sources/netoodiag.vsd
   labs/jbossweb/trunk/xdocs/sources/procdiag.vsd
   labs/jbossweb/trunk/xdocs/sources/sendfileflowchart.vsd
   labs/jbossweb/trunk/xdocs/sources/tcnativeblockda.vsd
Log:
Remove svn:keyword Author ... for binary resources


Property changes on: labs/jbossweb/trunk/src/share/resources/ROOT.war/favicon.ico
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/src/share/resources/ROOT.war/images/jboss_ics.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/src/share/resources/ROOT.war/images/jbosslogo.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/src/share/resources/ROOT.war/images/jbossweblogo.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/src/share/resources/ROOT.war/images/jbweb_pb.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/src/share/resources/ROOT.war/images/openssl_ics.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/src/share/resources/ROOT.war/images/tomcat_pb.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/src/share/resources/ROOT.war/images/void.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/src/share/resources/ROOT.war/logo.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/src/share/resources/bin/jboss.ico
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/src/windows/native/service/jbosssvc/MSG00001.bin
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/src/windows/native/service/jbosssvc/jboss.ico
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/add.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/benchmarks/10kssl.png
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/benchmarks/1kssl.png
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/benchmarks/apr.png
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/benchmarks/jio.png
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/benchmarks/ka50.png
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/benchmarks/ka50log.png
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/benchmarks/kat.png
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/benchmarks/kkt.png
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/benchmarks/ssl1.png
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/benchmarks/ssl1nl.png
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/code.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/design/acceptflowchart.png
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/design/configlayout.png
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/design/jbosswebarch.png
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/design/jbosswebblockda.png
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/design/netoodiag.png
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/design/procdiag.png
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/design/sendfileflowchart.png
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/design/tcnativeblockda.png
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/design.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/docs.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/downg.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/downr.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/excl.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/feather.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/fix.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/jboss_ics.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/jbosslogo.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/jbossweblogo.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/jbweb_pb.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/lock.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/no.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/ok.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/openssl_ics.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/printer.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank0.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank1.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank10.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank2.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank3.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank4.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank5.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank6.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank7.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank8.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank9.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/tomcat.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/tomcat_pb.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/update.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/upg.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/upr.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/void.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/x.gif
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/sources/acceptflowchart.vsd
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/sources/configlayout.vsd
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/sources/jbosswebarch.vsd
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/sources/jbosswebblockda.vsd
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/sources/netoodiag.vsd
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/sources/procdiag.vsd
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/sources/sendfileflowchart.vsd
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/sources/tcnativeblockda.vsd
___________________________________________________________________
Name: svn:keywords
   - Author Date Id Revision

[Jboss-svn-commits] JBL Code SVN: r4366 - in labs/jbossweb/trunk: src/share/native/build xdocs/images xdocs/images/benchmarks xdocs/images/design

From: <jbo...@li...> - 2006-05-23 07:29:41

Author: mla...@jb...
Date: 2006-05-23 03:28:45 -0400 (Tue, 23 May 2006)
New Revision: 4366

Modified:
   labs/jbossweb/trunk/src/share/native/build/buildworld.bat
   labs/jbossweb/trunk/xdocs/images/add.gif
   labs/jbossweb/trunk/xdocs/images/benchmarks/10kssl.png
   labs/jbossweb/trunk/xdocs/images/benchmarks/1kssl.png
   labs/jbossweb/trunk/xdocs/images/benchmarks/apr.png
   labs/jbossweb/trunk/xdocs/images/benchmarks/jio.png
   labs/jbossweb/trunk/xdocs/images/benchmarks/ka50.png
   labs/jbossweb/trunk/xdocs/images/benchmarks/ka50log.png
   labs/jbossweb/trunk/xdocs/images/benchmarks/kat.png
   labs/jbossweb/trunk/xdocs/images/benchmarks/kkt.png
   labs/jbossweb/trunk/xdocs/images/benchmarks/ssl1.png
   labs/jbossweb/trunk/xdocs/images/benchmarks/ssl1nl.png
   labs/jbossweb/trunk/xdocs/images/code.gif
   labs/jbossweb/trunk/xdocs/images/design.gif
   labs/jbossweb/trunk/xdocs/images/design/acceptflowchart.png
   labs/jbossweb/trunk/xdocs/images/design/configlayout.png
   labs/jbossweb/trunk/xdocs/images/design/jbosswebarch.png
   labs/jbossweb/trunk/xdocs/images/design/jbosswebblockda.png
   labs/jbossweb/trunk/xdocs/images/design/netoodiag.png
   labs/jbossweb/trunk/xdocs/images/design/procdiag.png
   labs/jbossweb/trunk/xdocs/images/design/sendfileflowchart.png
   labs/jbossweb/trunk/xdocs/images/design/tcnativeblockda.png
   labs/jbossweb/trunk/xdocs/images/docs.gif
   labs/jbossweb/trunk/xdocs/images/downg.gif
   labs/jbossweb/trunk/xdocs/images/downr.gif
   labs/jbossweb/trunk/xdocs/images/excl.gif
   labs/jbossweb/trunk/xdocs/images/feather.gif
   labs/jbossweb/trunk/xdocs/images/fix.gif
   labs/jbossweb/trunk/xdocs/images/jboss_ics.gif
   labs/jbossweb/trunk/xdocs/images/jbosslogo.gif
   labs/jbossweb/trunk/xdocs/images/jbossweblogo.gif
   labs/jbossweb/trunk/xdocs/images/jbweb_pb.gif
   labs/jbossweb/trunk/xdocs/images/lock.gif
   labs/jbossweb/trunk/xdocs/images/no.gif
   labs/jbossweb/trunk/xdocs/images/ok.gif
   labs/jbossweb/trunk/xdocs/images/openssl_ics.gif
   labs/jbossweb/trunk/xdocs/images/printer.gif
   labs/jbossweb/trunk/xdocs/images/rank0.gif
   labs/jbossweb/trunk/xdocs/images/rank1.gif
   labs/jbossweb/trunk/xdocs/images/rank10.gif
   labs/jbossweb/trunk/xdocs/images/rank2.gif
   labs/jbossweb/trunk/xdocs/images/rank3.gif
   labs/jbossweb/trunk/xdocs/images/rank4.gif
   labs/jbossweb/trunk/xdocs/images/rank5.gif
   labs/jbossweb/trunk/xdocs/images/rank7.gif
   labs/jbossweb/trunk/xdocs/images/rank8.gif
   labs/jbossweb/trunk/xdocs/images/rank9.gif
   labs/jbossweb/trunk/xdocs/images/tomcat.gif
   labs/jbossweb/trunk/xdocs/images/tomcat_pb.gif
   labs/jbossweb/trunk/xdocs/images/upg.gif
   labs/jbossweb/trunk/xdocs/images/upr.gif
   labs/jbossweb/trunk/xdocs/images/void.gif
   labs/jbossweb/trunk/xdocs/images/x.gif
Log:
Fix the paths to point to the latest Platform SDK

Modified: labs/jbossweb/trunk/src/share/native/build/buildworld.bat
===================================================================
--- labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-23 06:53:48 UTC (rev 4365)
+++ labs/jbossweb/trunk/src/share/native/build/buildworld.bat	2006-05-23 07:28:45 UTC (rev 4366)
@@ -13,8 +13,8 @@
 @if "%OS%" == "Windows_NT"  setlocal
 set MSVS8VC=C:\opt\msvs8\VC\bin
 REM set MSVS8VC=C:\D\Microsoft\MSVS8\VC\bin
-set PSDK5=C:\opt\psdk5
-REM PSDK5=C:\D\PSDK05
+set PSDK5=C:\opt\psdk6
+REM PSDK5=C:\D\PSDK6
 
 set OPENSSLBIN=buildssl
 set OPENSSLVER=0.9.8b


Property changes on: labs/jbossweb/trunk/xdocs/images/add.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/benchmarks/10kssl.png
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/benchmarks/1kssl.png
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/benchmarks/apr.png
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/benchmarks/jio.png
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/benchmarks/ka50.png
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/benchmarks/ka50log.png
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/benchmarks/kat.png
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/benchmarks/kkt.png
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/benchmarks/ssl1.png
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/benchmarks/ssl1nl.png
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/code.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/design/acceptflowchart.png
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/design/configlayout.png
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/design/jbosswebarch.png
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/design/jbosswebblockda.png
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/design/netoodiag.png
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/design/procdiag.png
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/design/sendfileflowchart.png
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/design/tcnativeblockda.png
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/design.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/docs.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/downg.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/downr.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/excl.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/feather.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/fix.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/jboss_ics.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/jbosslogo.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/jbossweblogo.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/jbweb_pb.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/lock.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/no.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/ok.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/openssl_ics.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/printer.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank0.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank1.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank10.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank2.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank3.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank4.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank5.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank7.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank8.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/rank9.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/tomcat.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/tomcat_pb.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/upg.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/upr.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/void.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision


Property changes on: labs/jbossweb/trunk/xdocs/images/x.gif
___________________________________________________________________
Name: svn:keywords
   + Author Date Id Revision

[Jboss-svn-commits] JBL Code SVN: r4365 - in labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats: . src/java/org/acme/insurance/launcher

From: <jbo...@li...> - 2006-05-23 06:53:56

Author: mic...@jb...
Date: 2006-05-23 02:53:48 -0400 (Tue, 23 May 2006)
New Revision: 4365

Modified:
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/Instructions.txt
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/launcher/PricingRuleLauncher.java
Log:
lab 4

Modified: labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/Instructions.txt
===================================================================
--- labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/Instructions.txt	2006-05-23 06:13:23 UTC (rev 4364)
+++ labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/Instructions.txt	2006-05-23 06:53:48 UTC (rev 4365)
@@ -9,7 +9,7 @@
 	FOR DECISION TABLES:
 	
 	Step 1: Import the project into eclipse.
-	Step 2: Note the location of PolicyPricing.xls decision table. Note that it is in a classpath
+	Step 2: Note the location of PolicyPricing.xls decision table (in /src/rules/decisiontables/). Note that it is in a classpath
 			accessible location (seperate to the source code).
 	Step 3: Right click on the PolicyPricing.xls spreadsheet, and choose the Open With menu item
 			followed by "System Editor". This will open up the decision table in the spreadsheet app.
@@ -43,6 +43,8 @@
 	
 	
 	
+	
+	
 Pre-requisites:
 	Eclipse 3.2 must be installed
 	JBoss Rules plug in installed into Eclipse

Modified: labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/launcher/PricingRuleLauncher.java
===================================================================
--- labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/launcher/PricingRuleLauncher.java	2006-05-23 06:13:23 UTC (rev 4364)
+++ labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/launcher/PricingRuleLauncher.java	2006-05-23 06:53:48 UTC (rev 4365)
@@ -2,8 +2,6 @@
 
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.Reader;
 import java.io.StringReader;
 
 import org.acme.insurance.Driver;
@@ -15,7 +13,6 @@
 import org.drools.compiler.PackageBuilder;
 import org.drools.decisiontable.InputType;
 import org.drools.decisiontable.SpreadsheetCompiler;
-import org.drools.rule.Package;
 
 /**
  * This is a sample file to launch a rule package from a rule source file.

[Jboss-svn-commits] JBL Code SVN: r4364 - labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/launcher

From: <jbo...@li...> - 2006-05-23 06:13:32

Author: mic...@jb...
Date: 2006-05-23 02:13:23 -0400 (Tue, 23 May 2006)
New Revision: 4364

Modified:
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/launcher/PricingRuleLauncher.java
Log:
lab 4

Modified: labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/launcher/PricingRuleLauncher.java
===================================================================
--- labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/launcher/PricingRuleLauncher.java	2006-05-23 06:00:27 UTC (rev 4363)
+++ labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/launcher/PricingRuleLauncher.java	2006-05-23 06:13:23 UTC (rev 4364)
@@ -57,6 +57,7 @@
     }
 
 
+    /** Build the rule base from the generated DRL */
 	private RuleBase buildRuleBase(String drl) throws DroolsParserException, IOException, Exception {
 		//now we build the rule package and rulebase, as if they are normal rules
 		PackageBuilder builder = new PackageBuilder();
@@ -82,56 +83,6 @@
 	}
 
 
-	/**
-     * Please note that this is the "low level" rule assembly API.
-     */
-	private static RuleBase readRule() throws Exception {
-		
-		//read in the source
-		Reader source = new InputStreamReader( PricingRuleLauncher.class.getResourceAsStream( "/Sample.drl" ) );
-		
-		
-		PackageBuilder builder = new PackageBuilder();
 
-		//this wil parse and compile in one step
-		//NOTE: There are 2 methods here, the one argument one is for normal DRL.
-		builder.addPackageFromDrl( source );
-
-		//Use the following instead of above if you are using a DSL:
-		//builder.addPackageFromDrl( source, dsl );
-		
-		//get the compiled package (which is serializable)
-		Package pkg = builder.getPackage();
-		
-		//add the package to a rulebase (deploy the rule package).
-		RuleBase ruleBase = RuleBaseFactory.newRuleBase();
-		ruleBase.addPackage( pkg );
-		return ruleBase;
-	}
-	
-	public static class Message {
-		public static final int HELLO = 0;
-		public static final int GOODBYE = 1;
-		
-		private String message;
-		
-		private int status;
-		
-		public String getMessage() {
-			return this.message;
-		}
-		
-		public void setMessage(String message) {
-			this.message = message;
-		}
-		
-		public int getStatus() {
-			return this.status;
-		}
-		
-		public void setStatus( int status ) {
-			this.status = status;
-		}
-	}
     
 }

[Jboss-svn-commits] JBL Code SVN: r4363 - in labs/jbossrules/trunk/documentation/training/developers-course: . lab-4-rule-formats lab-4-rule-formats/lib lab-4-rule-formats/src lab-4-rule-formats/src/java lab-4-rule-formats/src/java/org lab-4-rule-formats/src/java/org/acme lab-4-rule-formats/src/java/org/acme/insurance lab-4-rule-formats/src/java/org/acme/insurance/launcher lab-4-rule-formats/src/rules lab-4-rule-formats/src/rules/decisiontables

From: <jbo...@li...> - 2006-05-23 06:00:50

Author: mic...@jb...
Date: 2006-05-23 02:00:27 -0400 (Tue, 23 May 2006)
New Revision: 4363

Added:
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/.classpath
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/.project
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/Instructions.txt
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/lib/
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/lib/drools-decisiontables.jar
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/Driver.java
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/Policy.java
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/launcher/
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/launcher/PricingRuleLauncher.java
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/rules/
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/rules/decisiontables/
   labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/rules/decisiontables/PolicyPricing.xls
Log:
lab 4

Added: labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/.classpath
===================================================================
--- labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/.classpath	2006-05-23 05:28:34 UTC (rev 4362)
+++ labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/.classpath	2006-05-23 06:00:27 UTC (rev 4363)
@@ -0,0 +1,9 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/java"/>
+	<classpathentry kind="src" path="src/rules"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="DROOLS/JBoss Rules"/>
+	<classpathentry kind="lib" path="lib/drools-decisiontables.jar"/>
+	<classpathentry kind="output" path="bin"/>
+</classpath>


Property changes on: labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/.classpath
___________________________________________________________________
Name: svn:eol-style
   + native

Added: labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/.project
===================================================================
--- labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/.project	2006-05-23 05:28:34 UTC (rev 4362)
+++ labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/.project	2006-05-23 06:00:27 UTC (rev 4363)
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>lab-4-rule-formats</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.drools.ide.droolsbuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+	</natures>
+</projectDescription>


Property changes on: labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/.project
___________________________________________________________________
Name: svn:eol-style
   + native

Added: labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/Instructions.txt
===================================================================
--- labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/Instructions.txt	2006-05-23 05:28:34 UTC (rev 4362)
+++ labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/Instructions.txt	2006-05-23 06:00:27 UTC (rev 4363)
@@ -0,0 +1,50 @@
+---------------------------------------------
+JBoss Rules Essentual Lab Excercise 4
+	- Alternative rule formats -
+---------------------------------------------
+
+Instructions:
+	This excercise is a self contained Eclipse project. 	
+	
+	FOR DECISION TABLES:
+	
+	Step 1: Import the project into eclipse.
+	Step 2: Note the location of PolicyPricing.xls decision table. Note that it is in a classpath
+			accessible location (seperate to the source code).
+	Step 3: Right click on the PolicyPricing.xls spreadsheet, and choose the Open With menu item
+			followed by "System Editor". This will open up the decision table in the spreadsheet app.
+	
+	Step 4: Find the org.acme.insurance package, and note the domain object in there (they have default 
+			values for fields). Open the PricingRuleLauncher class in the launcher sub package.
+	Step 5: Fire the launcher (it has a main method). Run menu, Run-as, Java application
+			You should see some results - one item being the base price, another the discount. You
+			can also see messages being logged by the rules (one of the action columns).
+	Step 6: Change some values in the message being logged, and/or the values of discount or price.
+			You can also change the attributes of the driver, to see other rules fired.
+	Step 7: See if you can find any inconsitencies/gaps in the rule rows (where a price may not be found, or
+			where there is a "conflict" and 2 rules may match).
+				- Note: if there is a conflict, either add more conditions to make it unique, 
+				  or, use the "sequential" flag to force the rules to have a top to bottom order.
+				  You can then have a "hidden" action that does "drools.clearAgenda()" to stop for the first match 
+				  found. This is what we call a "dirty hack", but can be useful from time to time.
+	Step 8: Uncomment the line that prints out the DRL from the spreadsheet, inspect.
+	
+	Step 9: Make a grammatical error in the "rule template" row, check out the errors being reported (ie how to debug).
+	Step 10: For advanced folks, you can try the excel feature for "locking" cells so you can allow non 
+				techie folk to edit in relative safety.			  
+				 (http://support.microsoft.com/?kbid=214081)
+			
+			
+	
+	NOTE: when you make a change to the spreadsheet, you will need to refresh the eclipse project to pick up 
+	the latest (of course, if you change it to load direct from a file system, not the classpath,
+	then you won't need to do this).
+	
+	
+	
+	
+Pre-requisites:
+	Eclipse 3.2 must be installed
+	JBoss Rules plug in installed into Eclipse
+	(including the decision tables module).
+	Microsoft Excel or Open Office 2.0 should be installed.
\ No newline at end of file


Property changes on: labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/Instructions.txt
___________________________________________________________________
Name: svn:eol-style
   + native

Added: labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/lib/drools-decisiontables.jar
===================================================================
(Binary files differ)


Property changes on: labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/lib/drools-decisiontables.jar
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

Added: labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/Driver.java
===================================================================
--- labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/Driver.java	2006-05-23 05:28:34 UTC (rev 4362)
+++ labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/Driver.java	2006-05-23 06:00:27 UTC (rev 4363)
@@ -0,0 +1,41 @@
+package org.acme.insurance;
+
+/**
+ * This represents obviously a driver who is applying for an insurance Policy.
+ * @author Michael Neale
+ *
+ */
+public class Driver {
+
+	private String name = "Mr Joe Blogs";
+	private Integer age = new Integer(30);
+	private Integer priorClaims = new Integer(0);	
+	private String  locationRiskProfile = "LOW";
+	
+	public Integer getAge() {
+		return age;
+	}
+	public void setAge(Integer age) {
+		this.age = age;
+	}
+	public String getLocationRiskProfile() {
+		return locationRiskProfile;
+	}
+	public void setLocationRiskProfile(String locationRiskProfile) {
+		this.locationRiskProfile = locationRiskProfile;
+	}
+	public String getName() {
+		return name;
+	}
+	public void setName(String name) {
+		this.name = name;
+	}
+	public Integer getPriorClaims() {
+		return priorClaims;
+	}
+	public void setPriorClaims(Integer priorClaims) {
+		this.priorClaims = priorClaims;
+	}
+	
+	
+}


Property changes on: labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/Driver.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/Policy.java
===================================================================
--- labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/Policy.java	2006-05-23 05:28:34 UTC (rev 4362)
+++ labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/Policy.java	2006-05-23 06:00:27 UTC (rev 4363)
@@ -0,0 +1,49 @@
+package org.acme.insurance;
+
+/**
+ * This represents a policy that a driver is applying for. 
+ * 
+ * Obviously in the real world, there are actuaries to mess things up, but lets just pretend there is
+ * some simple base price and discount that we can calculate with relatively simple rules !
+ * 
+ * @author Michael Neale
+ */
+public class Policy {
+
+	private String type = "COMPREHENSIVE";
+	private boolean approved = true;
+	private int discountPercent = 0;
+	private int basePrice;
+	
+	public boolean isApproved() {
+		return approved;
+	}
+	public void setApproved(boolean approved) {
+		this.approved = approved;
+	}
+	public int getDiscountPercent() {
+		return discountPercent;
+	}
+	public void setDiscountPercent(int discountPercent) {
+		this.discountPercent = discountPercent;
+	}
+	
+	public String getType() {
+		return type;
+	}
+	
+	public void setType(String type) {
+		this.type = type;
+	}
+	
+	public void applyDiscount(int discount) {
+		discountPercent += discount;
+	}
+	public int getBasePrice() {
+		return basePrice;
+	}
+	public void setBasePrice(int basePrice) {
+		this.basePrice = basePrice;
+	}
+	
+}


Property changes on: labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/Policy.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/launcher/PricingRuleLauncher.java
===================================================================
--- labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/launcher/PricingRuleLauncher.java	2006-05-23 05:28:34 UTC (rev 4362)
+++ labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/launcher/PricingRuleLauncher.java	2006-05-23 06:00:27 UTC (rev 4363)
@@ -0,0 +1,137 @@
+package org.acme.insurance.launcher;
+
+import java.io.IOException;
+import java.io.InputStream;
+import java.io.InputStreamReader;
+import java.io.Reader;
+import java.io.StringReader;
+
+import org.acme.insurance.Driver;
+import org.acme.insurance.Policy;
+import org.drools.RuleBase;
+import org.drools.RuleBaseFactory;
+import org.drools.WorkingMemory;
+import org.drools.compiler.DroolsParserException;
+import org.drools.compiler.PackageBuilder;
+import org.drools.decisiontable.InputType;
+import org.drools.decisiontable.SpreadsheetCompiler;
+import org.drools.rule.Package;
+
+/**
+ * This is a sample file to launch a rule package from a rule source file.
+ */
+public class PricingRuleLauncher {
+
+    public static final void main(String[] args) throws Exception {    	
+    	PricingRuleLauncher launcher = new PricingRuleLauncher();
+    	launcher.executeExample();
+    }
+
+    
+    public void executeExample() throws Exception {
+    	
+    	//first we compile the decision table into a whole lot of rules.
+    	SpreadsheetCompiler compiler = new SpreadsheetCompiler();
+    	String drl = compiler.compile(getSpreadsheetStream(), InputType.XLS);
+
+    	//UNCOMMENT ME TO SEE THE DRL THAT IS GENERATED
+    	//System.out.println(drl);
+
+    	RuleBase ruleBase = buildRuleBase(drl);
+    	
+		WorkingMemory wm = ruleBase.newWorkingMemory();
+		
+		//now create some test data
+		Driver driver = new Driver();
+		Policy policy = new Policy();
+		
+		wm.assertObject(driver);
+		wm.assertObject(policy);
+		
+		wm.fireAllRules();
+		
+		System.out.println("BASE PRICE IS: " + policy.getBasePrice());
+		System.out.println("DISCOUNT IS: " + policy.getDiscountPercent());
+		
+    	
+    }
+
+
+	private RuleBase buildRuleBase(String drl) throws DroolsParserException, IOException, Exception {
+		//now we build the rule package and rulebase, as if they are normal rules
+		PackageBuilder builder = new PackageBuilder();
+		builder.addPackageFromDrl( new StringReader(drl) );
+		
+		//add the package to a rulebase (deploy the rule package).
+		RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+		ruleBase.addPackage( builder.getPackage() );
+		return ruleBase;
+	}
+    
+    
+
+    /**
+     * Need to get an input stream for a spreadsheet. 
+     * In this case, as it is in the projects source directory, it can be grabbed 
+     * from the classpath, but it could be anywhere.
+     * 
+     * Try changing it to load from a hard coded location on disk.
+     */
+    private InputStream getSpreadsheetStream() {
+    	return this.getClass().getResourceAsStream("/decisiontables/PolicyPricing.xls");
+	}
+
+
+	/**
+     * Please note that this is the "low level" rule assembly API.
+     */
+	private static RuleBase readRule() throws Exception {
+		
+		//read in the source
+		Reader source = new InputStreamReader( PricingRuleLauncher.class.getResourceAsStream( "/Sample.drl" ) );
+		
+		
+		PackageBuilder builder = new PackageBuilder();
+
+		//this wil parse and compile in one step
+		//NOTE: There are 2 methods here, the one argument one is for normal DRL.
+		builder.addPackageFromDrl( source );
+
+		//Use the following instead of above if you are using a DSL:
+		//builder.addPackageFromDrl( source, dsl );
+		
+		//get the compiled package (which is serializable)
+		Package pkg = builder.getPackage();
+		
+		//add the package to a rulebase (deploy the rule package).
+		RuleBase ruleBase = RuleBaseFactory.newRuleBase();
+		ruleBase.addPackage( pkg );
+		return ruleBase;
+	}
+	
+	public static class Message {
+		public static final int HELLO = 0;
+		public static final int GOODBYE = 1;
+		
+		private String message;
+		
+		private int status;
+		
+		public String getMessage() {
+			return this.message;
+		}
+		
+		public void setMessage(String message) {
+			this.message = message;
+		}
+		
+		public int getStatus() {
+			return this.status;
+		}
+		
+		public void setStatus( int status ) {
+			this.status = status;
+		}
+	}
+    
+}


Property changes on: labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/java/org/acme/insurance/launcher/PricingRuleLauncher.java
___________________________________________________________________
Name: svn:eol-style
   + native

Added: labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/rules/decisiontables/PolicyPricing.xls
===================================================================
(Binary files differ)


Property changes on: labs/jbossrules/trunk/documentation/training/developers-course/lab-4-rule-formats/src/rules/decisiontables/PolicyPricing.xls
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream

[Jboss-svn-commits] JBL Code SVN: r4362 - in labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions: forge-ear/src/META-INF forge-kosmos forge-kosmos/conf/portlet forge-kosmos/conf/server forge-wiki/src/etc/org/jboss/wiki

From: <jbo...@li...> - 2006-05-23 05:28:40

Author: dam...@jb...
Date: 2006-05-23 01:28:34 -0400 (Tue, 23 May 2006)
New Revision: 4362

Modified:
   labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-ear/src/META-INF/application.xml
   labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-kosmos/conf/portlet/portlet.xml
   labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-kosmos/conf/server/kosmos-services-servlet.xml
   labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-kosmos/conf/server/web.xml
   labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-kosmos/maven.xml
   labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/filedatasource.properties
Log:
Updating tag as it is out of synch with reality.

Modified: labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-ear/src/META-INF/application.xml
===================================================================
--- labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-ear/src/META-INF/application.xml	2006-05-23 04:19:28 UTC (rev 4361)
+++ labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-ear/src/META-INF/application.xml	2006-05-23 05:28:34 UTC (rev 4362)
@@ -13,11 +13,12 @@
 			<web-uri>blog-portlet.war</web-uri>
 		</web>
 	</module>
+	<!-- DIE KOSMOS DIE
 	<module>
 		<web>
 			<web-uri>kosmos-portlet.war</web-uri>
 		</web>
-	</module>
+	</module>-->
 	<module>
 		<web>
 			<web-uri>primates-portlet.war</web-uri>
@@ -28,11 +29,12 @@
 			<web-uri>polls-portlet.war</web-uri>
 		</web>
 	</module>
+	<!-- DIE KOSMOS DIE
 	<module>
 		<web>
 			<web-uri>kosmos-server.war</web-uri>
 		</web>
-	</module>
+	</module>-->
 	<module>
 		<web>
 			<web-uri>federation-register.war</web-uri>

Modified: labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-kosmos/conf/portlet/portlet.xml
===================================================================
--- labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-kosmos/conf/portlet/portlet.xml	2006-05-23 04:19:28 UTC (rev 4361)
+++ labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-kosmos/conf/portlet/portlet.xml	2006-05-23 05:28:34 UTC (rev 4362)
@@ -11,7 +11,7 @@
     </init-param>
     <init-param>
       <name>service.url</name>
-      <value>http://localhost:8080/kosmos-server/kosmos-services/jira-service</value>
+      <value>http://labs.jboss.com:8080/kosmos-server/kosmos-services/jira-service</value>
     </init-param>
     <init-param>
       <name>monitored.urls</name>
@@ -72,7 +72,7 @@
     </init-param>
     <init-param>
       <name>service.url</name>
-      <value>http://localhost:8080/kosmos-server/kosmos-services/svn-service</value>
+      <value>http://labs.jboss.com:8080/kosmos-server/kosmos-services/svn-service</value>
     </init-param>
     <init-param>
       <name>monitored.urls</name>

Modified: labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-kosmos/conf/server/kosmos-services-servlet.xml
===================================================================
--- labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-kosmos/conf/server/kosmos-services-servlet.xml	2006-05-23 04:19:28 UTC (rev 4361)
+++ labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-kosmos/conf/server/kosmos-services-servlet.xml	2006-05-23 05:28:34 UTC (rev 4362)
@@ -4,7 +4,7 @@
 <beans>
   <!-- CC service -->
   <bean id="ccService" class="hu.midori.kosmos.server.cc.CcServiceImpl">
-	  <property name="store" ref="labsCachedDataStore"/>  
+    <property name="store" ref="shotokuCachedDataStore"/>  
   </bean>
   <bean name="/cc-service" class="org.springframework.remoting.caucho.HessianServiceExporter">
     <property name="service" ref="ccService"/>
@@ -13,7 +13,7 @@
 
   <!-- JIRA service -->
   <bean id="jiraService" class="hu.midori.kosmos.server.jira.JiraServiceImpl">
-	  <property name="store" ref="labsCachedDataStore"/>  
+    <property name="store" ref="shotokuCachedDataStore"/>  
   </bean>
   <bean name="/jira-service" class="org.springframework.remoting.caucho.HessianServiceExporter">
     <property name="service" ref="jiraService"/>
@@ -22,7 +22,7 @@
 
   <!-- SF service -->
   <bean id="sfService" class="hu.midori.kosmos.server.sf.SfServiceImpl">
-	  <property name="store" ref="labsCachedDataStore"/>  
+    <property name="store" ref="shotokuCachedDataStore"/>  
   </bean>
   <bean name="/sf-service" class="org.springframework.remoting.caucho.HessianServiceExporter">
     <property name="service" ref="sfService"/>
@@ -31,15 +31,16 @@
 
   <!-- SVN service -->
   <bean id="svnService" class="hu.midori.kosmos.server.svn.SvnServiceImpl">
-	  <property name="store" ref="labsCachedDataStore"/>  
+    <property name="store" ref="shotokuCachedDataStore"/>  
   </bean>
   <bean name="/svn-service" class="org.springframework.remoting.caucho.HessianServiceExporter">
     <property name="service" ref="svnService"/>
     <property name="serviceInterface" value="hu.midori.kosmos.protocol.SvnService"/>
   </bean>
   
-  <!-- Labs cached data store -->
-  <bean id="labsCachedDataStore" class="org.jboss.kosmos.LabsCachedDataStore">
-  </bean>
-  
+  <!-- Shotoku cached data store -->
+  <bean id="shotokuCachedDataStore" class="org.jboss.kosmos.ShotokuCachedDataStore">
+    <property name="fileAccessUrl" value="http://localhost:8080/file-access"/>
+    <property name="prefix" value="kosmos/images/kosmos-cache"/>
+  </bean>
 </beans>
\ No newline at end of file

Modified: labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-kosmos/conf/server/web.xml
===================================================================
--- labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-kosmos/conf/server/web.xml	2006-05-23 04:19:28 UTC (rev 4361)
+++ labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-kosmos/conf/server/web.xml	2006-05-23 05:28:34 UTC (rev 4362)
@@ -10,7 +10,7 @@
   
   <context-param>
     <param-name>webdav.url</param-name>
-    <param-value>https://labs-stats:jbo...@cm.../trunk/forge/portal-content/kosmos/images</param-value>
+    <param-value>https://labs-stats:jbo...@cm.../prod/forge/portal-content/kosmos/images</param-value>
   </context-param>  
   <context-param>
     <param-name>webdav.user</param-name>

Modified: labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-kosmos/maven.xml
===================================================================
--- labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-kosmos/maven.xml	2006-05-23 04:19:28 UTC (rev 4361)
+++ labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-kosmos/maven.xml	2006-05-23 05:28:34 UTC (rev 4362)
@@ -13,15 +13,18 @@
     </goal>
 
     <goal name="build">
-	<attainGoal name="java:compile" />
+	<!-- DIE KOSMOS DIE
+		<attainGoal name="java:compile" /> -->
     </goal>
     
     <goal name="deploy">
 	<!-- Unzipping the jar-s -->
+
+	<!-- DIE KOSMOS DIE
 	<ant:unzip src="to-copy/kosmos-server.war" dest="target/kosmos-server.war" overwrite="true" />
-	<ant:unzip src="to-copy/kosmos-portlet.war" dest="target/kosmos-portlet.war" overwrite="true" />
+	<ant:unzip src="to-copy/kosmos-portlet.war" dest="target/kosmos-portlet.war" overwrite="true" /> -->
 
-	<!-- Copying configuration files -->
+	<!-- Copying configuration files DIE KOSMOS DIE
 	<ant:copy todir="target/kosmos-server.war/WEB-INF" overwrite="true">
 	    <ant:fileset dir="conf/server">
 		<ant:filename name="**/*" />
@@ -31,24 +34,25 @@
 	    <ant:fileset dir="conf/portlet">
 		<ant:filename name="**/*" />
 	    </ant:fileset>
-	</ant:copy>
+	</ant:copy> -->
 	
-	<!-- Copying cache class -->
+	<!-- Copying cache class DIE KOSMOS DIE
 	<ant:copy todir="target/kosmos-server.war/WEB-INF/classes" overwrite="true">
 	    <ant:fileset dir="target/classes">
 		<ant:filename name="**/*" />
 	    </ant:fileset>
-	</ant:copy>
+	</ant:copy> -->
 
-	<!-- Deleting old deployment -->
+	<!-- Deleting old deployment DIE KOSMOS DIE
 	<ant:delete dir="${local.deploy.dir}/kosmos-server.war" />
 	<ant:delete dir="${local.deploy.dir}/kosmos-portlet.war" />
-
-	<!-- Deploying new packages -->
+	-->
+	
+	<!-- Deploying new packages DIE KOSMOS DIE
 	<ant:copy todir="../${forge.ear.dir}/target/${forge.ear.name}" overwrite="true">
 	    <ant:fileset dir="target">
 		<ant:filename name="kosmos*/**" />
 	    </ant:fileset>
-	</ant:copy>
+	</ant:copy>-->
     </goal>
 </project>

Modified: labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/filedatasource.properties
===================================================================
--- labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/filedatasource.properties	2006-05-23 04:19:28 UTC (rev 4361)
+++ labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/forge/portal-extensions/forge-wiki/src/etc/org/jboss/wiki/filedatasource.properties	2006-05-23 05:28:34 UTC (rev 4362)
@@ -1,7 +1,7 @@
 # FileDataSource configuration file
 
 # pathToMedia - points, where JSPWiki file structure is situated
-pathToMedia = /usr/local/forge/wiki
+pathToMedia = /services/jbf-portal/wiki
 
 # pathToAttachements - points, where JSPWiki attachemets are situated
-pathToAttachements = /usr/local/forge/wiki
\ No newline at end of file
+pathToAttachements = /services/jbf-portal/wiki

[Jboss-svn-commits] JBL Code SVN: r4361 - labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule

From: <jbo...@li...> - 2006-05-23 04:19:31

Author: mar...@jb...
Date: 2006-05-23 00:19:28 -0400 (Tue, 23 May 2006)
New Revision: 4361

Modified:
   labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LogicTransformer.java
Log:
JBRULES-271 Incorrect Handling of 'I have found a number of issues.
1) re-ordering of elements by the transformer, which ofcourse messes up the column index alignment.
2) wasn't removing redundant nodes in some situations.
3) Was incorrectly increasing the counter values for 'or' elements.

Modified: labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LogicTransformer.java
===================================================================
--- labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LogicTransformer.java	2006-05-23 04:19:25 UTC (rev 4360)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LogicTransformer.java	2006-05-23 04:19:28 UTC (rev 4361)
@@ -21,6 +21,7 @@
 import java.util.HashSet;
 import java.util.Iterator;
 import java.util.List;
+import java.util.ListIterator;
 import java.util.Map;
 import java.util.Set;
 
@@ -139,6 +140,8 @@
                     ands[i] = newAnd; 
                 }
                 
+                checkForAndRemoveDuplicates( ands[i] );
+                
                 i++;
             }
 
@@ -160,9 +163,8 @@
      * @param ce
      */
     void processTree(GroupElement ce) throws InvalidPatternException {
-        List newChildren = new ArrayList();
 
-        for ( Iterator it = ce.getChildren().iterator(); it.hasNext(); ) {
+        for ( ListIterator it = ce.getChildren().listIterator(); it.hasNext(); ) {
             Object object = it.next();
             if ( object instanceof GroupElement ) {
                 GroupElement parent = (GroupElement) object;
@@ -176,18 +178,15 @@
                 for ( Iterator orIter = parent.getChildren().iterator(); orIter.hasNext(); ) {
                     Object object2 = orIter.next();
                     if ( object2 instanceof Or ) {
-                        newChildren.add( applyOrTransformation( parent,
-                                                                (GroupElement) object2 ) );
                         it.remove();
+                        it.add( applyOrTransformation( parent,
+                                                       (GroupElement) object2 ) );                        
                         break;
                     }
                 }
 
             }
         }
-
-        // Add all the transformed children
-        ce.getChildren().addAll( newChildren );
     }
 
     /**
@@ -213,22 +212,23 @@
      * 
      */
     void checkForAndRemoveDuplicates(GroupElement parent) {
-        List newChildren = new ArrayList();
-
-        for ( Iterator it = parent.getChildren().iterator(); it.hasNext(); ) {
+        for ( ListIterator it = parent.getChildren().listIterator(); it.hasNext(); ) {
             Object object = it.next();
             // Remove the duplicate if the classes are the same and
             // removeDuplicate method returns true
             if ( parent.getClass().isInstance( object ) && removeDuplicate( parent,
-                                                                            (GroupElement) object ) ) {
+                                                                           (GroupElement) object ) ) {
+                List newList = new ArrayList(); 
                 GroupElement child = (GroupElement) object;
                 for ( Iterator childIter = child.getChildren().iterator(); childIter.hasNext(); ) {
-                    newChildren.add( childIter.next() );
+                     newList.add( childIter.next() );
                 }
                 it.remove();
+                for ( Iterator childIter = newList.iterator(); childIter.hasNext(); ) {
+                    it.add( childIter.next() );   
+                }
             }
-        }
-        parent.getChildren().addAll( newChildren );
+        }                
     }
 
     GroupElement applyOrTransformation(GroupElement parent,

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

From: <jbo...@li...> - 2006-05-23 04:19:28

Author: mar...@jb...
Date: 2006-05-23 00:19:25 -0400 (Tue, 23 May 2006)
New Revision: 4360

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java
Log:
JBRULES-271 Incorrect Handling of 'I have found a number of issues.
1) re-ordering of elements by the transformer, which ofcourse messes up the column index alignment.
2) wasn't removing redundant nodes in some situations.
3) Was incorrectly increasing the counter values for 'or' elements.

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-05-23 03:55:29 UTC (rev 4359)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/RuleBuilder.java	2006-05-23 04:19:25 UTC (rev 4360)
@@ -88,7 +88,7 @@
 
     private int                         counter;
 
-    private int                         columnCounter;
+    private ColumnCounter               columnCounter;
 
     private int                         columnOffset;
 
@@ -153,6 +153,7 @@
         this.invokerLookups = new HashMap();
         this.declarations = new HashMap();
         this.descrLookups = new HashMap();
+        this.columnCounter = new ColumnCounter();
 
         this.typeResolver = new ClassTypeResolver( pkg.getImports(),
                                                    pkg.getPackageCompilationData().getClassLoader() );
@@ -180,7 +181,7 @@
     }
 
     private void setAttributes(Rule rule,
-                               List attributes) {
+                               List attributes) {        
         for ( Iterator it = attributes.iterator(); it.hasNext(); ) {
             AttributeDescr attributeDescr = (AttributeDescr) it.next();
             String name = attributeDescr.getName();
@@ -218,7 +219,7 @@
             if ( object instanceof ConditionalElementDescr ) {
                 if ( object instanceof AndDescr ) {
                     And and = new And();
-                    //rule.addChild( and );
+                    this.columnCounter.setParent( and );
                     build( rule,
                            (ConditionalElementDescr) object,
                            and,
@@ -227,16 +228,18 @@
                     rule.addPattern( and );
                 } else if ( object instanceof OrDescr ) {
                     Or or = new Or();
+                    this.columnCounter.setParent( or );                    
                     build( rule,
                            (ConditionalElementDescr) object,
                            or,
-                           true,
+                           false,
                            false );
                     rule.addPattern( or );
                 } else if ( object instanceof NotDescr ) {
                     // We cannot have declarations created inside a not visible outside it, so track no declarations so they can be removed
                     this.notDeclarations = new HashMap();
                     Not not = new Not();
+                    this.columnCounter.setParent( not );                    
                     build( rule,
                            (ConditionalElementDescr) object,
                            not,
@@ -254,6 +257,7 @@
                     // We cannot have declarations created inside a not visible outside it, so track no declarations so they can be removed
                     this.notDeclarations = new HashMap();
                     Exists exists = new Exists();
+                    this.columnCounter.setParent( exists );                    
                     build( rule,
                            (ConditionalElementDescr) object,
                            exists,
@@ -299,6 +303,7 @@
             if ( object instanceof ConditionalElementDescr ) {
                 if ( object instanceof AndDescr ) {
                     And and = new And();
+                    this.columnCounter.setParent( and );
                     build( rule,
                            (ConditionalElementDescr) object,
                            and,
@@ -307,14 +312,16 @@
                     ce.addChild( and );                    
                 } else if ( object instanceof OrDescr ) {
                     Or or = new Or();
+                    this.columnCounter.setParent( or );
                     build( rule,
                            (ConditionalElementDescr) object,
                            or,
-                           true,
+                           false,
                            false);
                     ce.addChild( or );                    
                 } else if ( object instanceof NotDescr ) {
                     Not not = new Not();
+                    this.columnCounter.setParent( not );
                     build( rule,
                            (ConditionalElementDescr) object,
                            not,
@@ -323,6 +330,7 @@
                     ce.addChild( not );                    
                 } else if ( object instanceof ExistsDescr ) {
                     Exists exists = new Exists();
+                    this.columnCounter.setParent( exists );
                     build( rule,
                            (ConditionalElementDescr) object,
                            exists,
@@ -373,7 +381,7 @@
 
         Column column;
         if ( columnDescr.getIdentifier() != null && !columnDescr.getIdentifier().equals( "" ) ) {
-            column = new Column( columnCounter++,
+            column = new Column( this.columnCounter.getNext(),
                                  this.columnOffset,
                                  new ClassObjectType( clazz ),
                                  columnDescr.getIdentifier() );;
@@ -385,7 +393,7 @@
                                           column.getDeclaration() );
             }
         } else {
-            column = new Column( columnCounter++,
+            column = new Column( this.columnCounter.getNext(),
                                  this.columnOffset,
                                  new ClassObjectType( clazz ),
                                  null);
@@ -960,4 +968,31 @@
         }
         return usedDeclarations;
     }
+    
+    static class ColumnCounter {
+        // we start with -1 so that we can ++this.value - otherwise the first element has a lower value than the second in an 'or'
+        private int value = -1;
+        
+        private boolean orCheck;
+        
+        private GroupElement ge;
+        
+        public void setParent(GroupElement ge) {
+            this.ge = ge;
+            this.orCheck = false;
+        }
+        
+        public int getNext() {
+            if ( this.ge != null && this.ge.getClass() == Or.class ) {
+                if ( !this.orCheck ) {
+                    this.orCheck = true;
+                    return ++this.value;
+                } else {
+                    return this.value;
+                }                                
+            } else {
+                return ++this.value;
+            }
+        }
+    }
 }
\ No newline at end of file

[Jboss-svn-commits] JBL Code SVN: r4359 - labs/jbosslabs/tags

From: <jbo...@li...> - 2006-05-23 03:55:33

Author: dam...@jb...
Date: 2006-05-22 23:55:29 -0400 (Mon, 22 May 2006)
New Revision: 4359

Added:
   labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06/
Log:
Tagging for the 05.23.06 release of Labs which patches the wiki semaphore problem.

Copied: labs/jbosslabs/tags/Labs-Portal-2.0-ComTheme-05.23.06 (from rev 4358, labs/jbosslabs/branches/Labs-Portal-2.0-ComTheme)

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

From: <jbo...@li...> - 2006-05-23 02:35:40

Author: mic...@jb...
Date: 2006-05-22 22:35:27 -0400 (Mon, 22 May 2006)
New Revision: 4358

Modified:
   labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/FunctionFixer.java
   labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/semantics/java/FunctionFixerTest.java
Log:
JBRULES-273

Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/FunctionFixer.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/FunctionFixer.java	2006-05-23 02:07:18 UTC (rev 4357)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/semantics/java/FunctionFixer.java	2006-05-23 02:35:27 UTC (rev 4358)
@@ -41,35 +41,42 @@
     public String fix(String raw, Pattern pattern) {
         if (raw == null) return null;
         StringBuffer buf = new StringBuffer();
-        int lastIndex = 0;
+        int startIndex = 0, lastIndex = 0;
         
-        Matcher matcher = pattern.matcher(raw);
-        
-        while(matcher.find()) {
-            String pre = matcher.group(1);
-            if (matcher.group(1) != null) {
-                String trimmedPre = pre.trim();
-                if (trimmedPre.endsWith( "." ) || trimmedPre.endsWith( "new" )) {
-                    //leave alone
-                    continue;
-                 }
+            Matcher matcher = pattern.matcher(raw);
+            while (matcher.find(startIndex)) {
+                  startIndex = getStartIndex(matcher);
+                  
+                String pre = matcher.group(1);
+                if (matcher.group(1) != null) {
+                    String trimmedPre = pre.trim();
+                    if (trimmedPre.endsWith( "." ) || trimmedPre.endsWith( "new" )) {
+                        //leave alone
+                        continue;
+                     }
+                }
+                String function = matcher.group(2).trim();
+                //if we have a reserve  d work, DO NOT TOUCH !
+                if (KEYWORDS.contains( function )) continue;
+                
+                String params = matcher.group(3).trim();
+                
+                String target = ucFirst(function) + "." + function + "(" + params + ")";
+                
+                buf.append( raw.substring( lastIndex, matcher.start( 2 ) ) );
+                buf.append( target );
+  
+                lastIndex = matcher.end();
             }
-            String function = matcher.group(2).trim();
-            //if we have a reserved work, DO NOT TOUCH !
-            if (KEYWORDS.contains( function )) continue;
-            
-            String params = matcher.group(3).trim();
-            
-            String target = ucFirst(function) + "." + function + "(" + params + ")";
-            
-            buf.append( raw.substring( lastIndex, matcher.start( 2 ) ) );
-            buf.append( target );
-            lastIndex = matcher.end();
-        }
+
         buf.append( raw.substring( lastIndex ) );
         return buf.toString();
     }
     
+    private int getStartIndex(Matcher matcher) {
+        return matcher.start(3) <= 0 ? matcher.end() + 1 : matcher.start(3); 
+    }
+    
     private String ucFirst(String name) {
         return name.toUpperCase().charAt( 0 ) + name.substring( 1 );
     }    

Modified: labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/semantics/java/FunctionFixerTest.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/semantics/java/FunctionFixerTest.java	2006-05-23 02:07:18 UTC (rev 4357)
+++ labs/jbossrules/trunk/drools-compiler/src/test/java/org/drools/semantics/java/FunctionFixerTest.java	2006-05-23 02:35:27 UTC (rev 4358)
@@ -71,12 +71,31 @@
                       fixer.fix( "\nfor(int i=0; i < 2; i++) { /*do noithing*/ }" ) );
     }
     
-    public void testNestedInAMethod() {
+    public void testMultipleInABracket() {
         FunctionFixer fixer = new FunctionFixer();
-            assertEquals( "obj.method(Foo.foo(bar));",
-                          fixer.fix( "obj.method(foo(bar));" ) );    
+            assertEquals( "if (Foo.foo(bar)) { Bar.bar(baz); }",
+                          fixer.fix( "if (foo(bar)) { bar(baz); }" ) );    
 
         
     }
+    
+    public void testInBrackets() {
+        FunctionFixer fixer = new FunctionFixer();
+        assertEquals( "if (Foo.foo(bar))",
+                      fixer.fix( "if (foo(bar))" ) );    
+
         
+        
+    }
+    
+    public void testAlreadyAdded() {
+        FunctionFixer fixer = new FunctionFixer();
+        assertEquals( "Foo.foo(bar)",
+                      fixer.fix( "Foo.foo(bar)" ) );    
+
+        
+        
+    }    
+
+        
 }
\ No newline at end of file

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

Flat | Threaded

<< < 1 .. 33 34 35 36 37 .. 165 > >> (Page 35 of 165)