Menu
▾
▴
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
|
|
From: <jbo...@li...> - 2006-04-13 17:06:58
|
Author: dam...@jb... Date: 2006-04-13 13:06:56 -0400 (Thu, 13 Apr 2006) New Revision: 3688 Added: labs/jbossweb/tags/ Log: Moving jbossweb. |
|
From: <jbo...@li...> - 2006-04-13 17:06:54
|
Author: dam...@jb... Date: 2006-04-13 13:06:52 -0400 (Thu, 13 Apr 2006) New Revision: 3687 Added: labs/jbossweb/branches/ Log: Moving jbossweb. |
|
From: <jbo...@li...> - 2006-04-13 17:06:51
|
Author: dam...@jb... Date: 2006-04-13 13:06:46 -0400 (Thu, 13 Apr 2006) New Revision: 3686 Added: labs/jbossweb/ Log: Moving jbossweb. |
|
From: <jbo...@li...> - 2006-04-13 16:17:30
|
Author: adamw
Date: 2006-04-13 12:17:13 -0400 (Thu, 13 Apr 2006)
New Revision: 3685
Added:
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/WikiLinkEntry.java
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/EntryFactory.java
labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
labs/jbosslabs/trunk/portal-extensions/forge-navigation/src/java/org/jboss/forge/navigation/NavigationConfWatcher.java
labs/jbosslabs/trunk/portal-extensions/forge-sar/
Log:
A bug fix & wiki link added
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/EntryFactory.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/EntryFactory.java 2006-04-13 11:20:51 UTC (rev 3684)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/EntryFactory.java 2006-04-13 16:17:13 UTC (rev 3685)
@@ -33,6 +33,7 @@
private final static String PROJECTS_MENU = "projects-menu";
private final static String PROJECT_MENU = "project-menu";
private final static String PROJECT_LINK = "project-link";
+ private final static String WIKI_LINK = "wiki-link";
private final static String PAGE = "page";
private final static String LINK = "link";
private final static String FREEZONE = "freezone";
@@ -88,6 +89,14 @@
}
}
+ if (WIKI_LINK.equals(type)) {
+ if (project != null) {
+ return new WikiLinkEntry(portalName, project, node);
+ } else {
+ return null;
+ }
+ }
+
return null;
}
}
Added: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/WikiLinkEntry.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/WikiLinkEntry.java 2006-04-13 11:20:51 UTC (rev 3684)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/navigation/WikiLinkEntry.java 2006-04-13 16:17:13 UTC (rev 3685)
@@ -0,0 +1,21 @@
+package org.jboss.forge.common.navigation;
+
+import org.jboss.forge.common.projects.ProjectDescriptor;
+import org.jboss.forge.common.projects.ProjectsHelper;
+import org.jboss.forge.common.ForgeHelper;
+import org.w3c.dom.Node;
+
+/**
+ * @author Adam Warski (ad...@as...)
+ */
+public class WikiLinkEntry extends LinkEntry {
+ public WikiLinkEntry(String portalName, ProjectDescriptor project, Node root) {
+ super(portalName, project, root);
+
+ setDisplay("Wiki");
+ }
+
+ protected String generateLink(String content) {
+ return ForgeHelper.createWikiLink(getPortalName(), getProject().getId());
+ }
+}
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java 2006-04-13 11:20:51 UTC (rev 3684)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/src/java/org/jboss/forge/common/projects/ProjectsHelper.java 2006-04-13 16:17:13 UTC (rev 3685)
@@ -80,7 +80,7 @@
public final static String PROJECT_DESC = "project.xml";
public final static String PROJECTS_DESC = "projects.xml";
- protected final static String LEVELS_DESC = "levels.xml";
+ public final static String LEVELS_DESC = "levels.xml";
protected final static String PAGES_DESC = "pages.xml";
protected final static String JEMS_DESC = "jems.xml";
protected final static String CATEGORIES_DESC = "categories.xml";
Modified: labs/jbosslabs/trunk/portal-extensions/forge-navigation/src/java/org/jboss/forge/navigation/NavigationConfWatcher.java
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-navigation/src/java/org/jboss/forge/navigation/NavigationConfWatcher.java 2006-04-13 11:20:51 UTC (rev 3684)
+++ labs/jbosslabs/trunk/portal-extensions/forge-navigation/src/java/org/jboss/forge/navigation/NavigationConfWatcher.java 2006-04-13 16:17:13 UTC (rev 3685)
@@ -23,6 +23,7 @@
import org.jboss.shotoku.cache.ShotokuResourceWatcher;
import org.jboss.shotoku.cache.ChangeType;
+import org.jboss.forge.common.projects.ProjectsHelper;
import java.util.Map;
@@ -37,6 +38,8 @@
public NavigationDescriptor init(String key) {
addWatchedPath(key, NavigationTools.getXmlCmPath(key));
+ addWatchedPath(key, key + "/" + ProjectsHelper.MEMBERS_DIR +
+ "/" + ProjectsHelper.LEVELS_DESC);
return getDesc(key);
}
Property changes on: labs/jbosslabs/trunk/portal-extensions/forge-sar
___________________________________________________________________
Name: svn:ignore
+ target
|
|
From: <jbo...@li...> - 2006-04-13 11:20:54
|
Author: rem...@jb...
Date: 2006-04-13 07:20:51 -0400 (Thu, 13 Apr 2006)
New Revision: 3684
Modified:
trunk/labs/jbossweb/src/share/classes/org/apache/catalina/servlets/DefaultServlet.java
Log:
- Port patch for full range.
Modified: trunk/labs/jbossweb/src/share/classes/org/apache/catalina/servlets/DefaultServlet.java
===================================================================
--- trunk/labs/jbossweb/src/share/classes/org/apache/catalina/servlets/DefaultServlet.java 2006-04-13 03:47:28 UTC (rev 3683)
+++ trunk/labs/jbossweb/src/share/classes/org/apache/catalina/servlets/DefaultServlet.java 2006-04-13 11:20:51 UTC (rev 3684)
@@ -1,5 +1,5 @@
/*
- * Copyright 1999,2004 The Apache Software Foundation.
+ * Copyright 1999,2004-2006 The Apache Software Foundation.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
@@ -32,9 +32,9 @@
import java.io.Reader;
import java.io.StringReader;
import java.io.StringWriter;
-import java.util.Enumeration;
+import java.util.ArrayList;
+import java.util.Iterator;
import java.util.StringTokenizer;
-import java.util.Vector;
import javax.naming.InitialContext;
import javax.naming.NameClassPair;
@@ -69,7 +69,7 @@
*
* @author Craig R. McClanahan
* @author Remy Maucherat
- * @version $Revision: 332127 $ $Date: 2005-11-09 20:50:47 +0100 (mer., 09 nov. 2005) $
+ * @version $Revision: 393784 $ $Date: 2006-04-13 13:19:06 +0200 (jeu., 13 avr. 2006) $
*/
public class DefaultServlet
@@ -152,6 +152,12 @@
protected int sendfileSize = 48 * 1024;
+ /**
+ * Full range marker.
+ */
+ protected static ArrayList FULL = new ArrayList();
+
+
// ----------------------------------------------------- Static Initializer
@@ -190,7 +196,7 @@
/**
* Size of file transfer buffer in bytes.
*/
- private static final int BUFFER_SIZE = 4096;
+ protected static final int BUFFER_SIZE = 4096;
// --------------------------------------------------------- Public Methods
@@ -732,7 +738,7 @@
cacheEntry.attributes.setMimeType(contentType);
}
- Vector ranges = null;
+ ArrayList ranges = null;
long contentLength = -1L;
if (cacheEntry.context != null) {
@@ -791,9 +797,10 @@
}
- if ( (cacheEntry.context != null) ||
- ( ((ranges == null) || (ranges.isEmpty()))
- && (request.getHeader("Range") == null) ) ) {
+ if ( (cacheEntry.context != null)
+ || ( ((ranges == null) || (ranges.isEmpty()))
+ && (request.getHeader("Range") == null) )
+ || (ranges == FULL) ) {
// Set the appropriate output headers
if (contentType != null) {
@@ -851,7 +858,7 @@
if (ranges.size() == 1) {
- Range range = (Range) ranges.elementAt(0);
+ Range range = (Range) ranges.get(0);
response.addHeader("Content-Range", "bytes "
+ range.start
+ "-" + range.end + "/"
@@ -897,10 +904,10 @@
// Silent catch
}
if (ostream != null) {
- copy(cacheEntry, ostream, ranges.elements(),
+ copy(cacheEntry, ostream, ranges.iterator(),
contentType);
} else {
- copy(cacheEntry, writer, ranges.elements(),
+ copy(cacheEntry, writer, ranges.iterator(),
contentType);
}
}
@@ -980,7 +987,7 @@
* @param response The servlet response we are creating
* @return Vector of ranges
*/
- protected Vector parseRange(HttpServletRequest request,
+ protected ArrayList parseRange(HttpServletRequest request,
HttpServletResponse response,
ResourceAttributes resourceAttributes)
throws IOException {
@@ -1005,7 +1012,7 @@
// If the ETag the client gave does not match the entity
// etag, then the entire entity is returned.
if (!eTag.equals(headerValue.trim()))
- return null;
+ return FULL;
} else {
@@ -1013,7 +1020,7 @@
// the last modification date of the entity, the entire entity
// is returned.
if (lastModified > (headerValueTime + 1000))
- return null;
+ return FULL;
}
@@ -1042,7 +1049,7 @@
// Vector which will contain all the ranges which are successfully
// parsed.
- Vector result = new Vector();
+ ArrayList result = new ArrayList();
StringTokenizer commaTokenizer = new StringTokenizer(rangeHeader, ",");
// Parsing the range list
@@ -1105,7 +1112,7 @@
return null;
}
- result.addElement(currentRange);
+ result.add(currentRange);
}
return result;
@@ -1510,13 +1517,13 @@
}
- // -------------------------------------------------------- Private Methods
+ // -------------------------------------------------------- protected Methods
/**
* Check if sendfile can be used.
*/
- private boolean checkSendfile(HttpServletRequest request,
+ protected boolean checkSendfile(HttpServletRequest request,
HttpServletResponse response,
CacheEntry entry,
long length, Range range) {
@@ -1553,7 +1560,7 @@
* and false if the condition is not satisfied, in which case request
* processing is stopped
*/
- private boolean checkIfMatch(HttpServletRequest request,
+ protected boolean checkIfMatch(HttpServletRequest request,
HttpServletResponse response,
ResourceAttributes resourceAttributes)
throws IOException {
@@ -1598,7 +1605,7 @@
* and false if the condition is not satisfied, in which case request
* processing is stopped
*/
- private boolean checkIfModifiedSince(HttpServletRequest request,
+ protected boolean checkIfModifiedSince(HttpServletRequest request,
HttpServletResponse response,
ResourceAttributes resourceAttributes)
throws IOException {
@@ -1635,7 +1642,7 @@
* and false if the condition is not satisfied, in which case request
* processing is stopped
*/
- private boolean checkIfNoneMatch(HttpServletRequest request,
+ protected boolean checkIfNoneMatch(HttpServletRequest request,
HttpServletResponse response,
ResourceAttributes resourceAttributes)
throws IOException {
@@ -1693,7 +1700,7 @@
* and false if the condition is not satisfied, in which case request
* processing is stopped
*/
- private boolean checkIfUnmodifiedSince(HttpServletRequest request,
+ protected boolean checkIfUnmodifiedSince(HttpServletRequest request,
HttpServletResponse response,
ResourceAttributes resourceAttributes)
throws IOException {
@@ -1726,7 +1733,7 @@
*
* @exception IOException if an input/output error occurs
*/
- private void copy(CacheEntry cacheEntry, InputStream is,
+ protected void copy(CacheEntry cacheEntry, InputStream is,
ServletOutputStream ostream)
throws IOException {
@@ -1776,7 +1783,7 @@
*
* @exception IOException if an input/output error occurs
*/
- private void copy(CacheEntry cacheEntry, InputStream is, PrintWriter writer)
+ protected void copy(CacheEntry cacheEntry, InputStream is, PrintWriter writer)
throws IOException {
IOException exception = null;
@@ -1823,7 +1830,7 @@
* @param range Range the client wanted to retrieve
* @exception IOException if an input/output error occurs
*/
- private void copy(CacheEntry cacheEntry, ServletOutputStream ostream,
+ protected void copy(CacheEntry cacheEntry, ServletOutputStream ostream,
Range range)
throws IOException {
@@ -1858,7 +1865,7 @@
* @param range Range the client wanted to retrieve
* @exception IOException if an input/output error occurs
*/
- private void copy(CacheEntry cacheEntry, PrintWriter writer,
+ protected void copy(CacheEntry cacheEntry, PrintWriter writer,
Range range)
throws IOException {
@@ -1901,19 +1908,19 @@
* @param contentType Content type of the resource
* @exception IOException if an input/output error occurs
*/
- private void copy(CacheEntry cacheEntry, ServletOutputStream ostream,
- Enumeration ranges, String contentType)
+ protected void copy(CacheEntry cacheEntry, ServletOutputStream ostream,
+ Iterator ranges, String contentType)
throws IOException {
IOException exception = null;
- while ( (exception == null) && (ranges.hasMoreElements()) ) {
+ while ( (exception == null) && (ranges.hasNext()) ) {
InputStream resourceInputStream = cacheEntry.resource.streamContent();
InputStream istream =
new BufferedInputStream(resourceInputStream, input);
- Range currentRange = (Range) ranges.nextElement();
+ Range currentRange = (Range) ranges.next();
// Writing MIME header.
ostream.println();
@@ -1958,13 +1965,13 @@
* @param contentType Content type of the resource
* @exception IOException if an input/output error occurs
*/
- private void copy(CacheEntry cacheEntry, PrintWriter writer,
- Enumeration ranges, String contentType)
+ protected void copy(CacheEntry cacheEntry, PrintWriter writer,
+ Iterator ranges, String contentType)
throws IOException {
IOException exception = null;
- while ( (exception == null) && (ranges.hasMoreElements()) ) {
+ while ( (exception == null) && (ranges.hasNext()) ) {
InputStream resourceInputStream = cacheEntry.resource.streamContent();
@@ -1976,7 +1983,7 @@
fileEncoding);
}
- Range currentRange = (Range) ranges.nextElement();
+ Range currentRange = (Range) ranges.next();
// Writing MIME header.
writer.println();
@@ -2019,7 +2026,7 @@
* @param ostream The output stream to write to
* @return Exception which occurred during processing
*/
- private IOException copyRange(InputStream istream,
+ protected IOException copyRange(InputStream istream,
ServletOutputStream ostream) {
// Copy the input stream to the output stream
@@ -2052,7 +2059,7 @@
* @param writer The writer to write to
* @return Exception which occurred during processing
*/
- private IOException copyRange(Reader reader, PrintWriter writer) {
+ protected IOException copyRange(Reader reader, PrintWriter writer) {
// Copy the input stream to the output stream
IOException exception = null;
@@ -2086,7 +2093,7 @@
* @param end End of the range which will be copied
* @return Exception which occurred during processing
*/
- private IOException copyRange(InputStream istream,
+ protected IOException copyRange(InputStream istream,
ServletOutputStream ostream,
long start, long end) {
@@ -2138,7 +2145,7 @@
* @param end End of the range which will be copied
* @return Exception which occurred during processing
*/
- private IOException copyRange(Reader reader, PrintWriter writer,
+ protected IOException copyRange(Reader reader, PrintWriter writer,
long start, long end) {
try {
@@ -2179,7 +2186,7 @@
// ------------------------------------------------------ Range Inner Class
- private class Range {
+ protected class Range {
public long start;
public long end;
|
|
From: <jbo...@li...> - 2006-04-13 03:32:15
|
Author: mic...@jb...
Date: 2006-04-12 23:32:07 -0400 (Wed, 12 Apr 2006)
New Revision: 3682
Modified:
labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/dsl/editor/DSLEditor.java
Log:
JBRULES-88
Modified: labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/dsl/editor/DSLEditor.java
===================================================================
--- labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/dsl/editor/DSLEditor.java 2006-04-13 03:31:52 UTC (rev 3681)
+++ labs/jbossrules/trunk/drools-ide/src/main/java/org/drools/ide/dsl/editor/DSLEditor.java 2006-04-13 03:32:07 UTC (rev 3682)
@@ -5,9 +5,18 @@
import java.io.IOException;
import java.io.InputStream;
import java.io.InputStreamReader;
+import java.util.ArrayList;
+import java.util.Iterator;
+import java.util.List;
+import org.drools.ide.DroolsIDEPlugin;
+import org.drools.ide.builder.IDroolsModelMarker;
+import org.drools.lang.dsl.template.MappingError;
import org.drools.lang.dsl.template.NLMappingItem;
+import org.eclipse.core.resources.IMarker;
import org.eclipse.core.resources.IResource;
+import org.eclipse.core.resources.IWorkspace;
+import org.eclipse.core.resources.IWorkspaceRunnable;
import org.eclipse.core.runtime.CoreException;
import org.eclipse.core.runtime.IProgressMonitor;
import org.eclipse.jface.viewers.IStructuredSelection;
@@ -59,7 +68,9 @@
private void saveFile(IProgressMonitor monitor,
File outputFile, FileEditorInput input) {
- try {
+ try {
+ validate( input );
+
FileWriter writer = new FileWriter(outputFile);
model.save( writer );
@@ -73,6 +84,51 @@
}
}
+ private void validate(FileEditorInput input) {
+ removeProblemsFor( input.getFile() );
+ List errs = new ArrayList();
+ for ( Iterator iter = model.getMappings().iterator(); iter.hasNext(); ) {
+ NLMappingItem item = (NLMappingItem) iter.next();
+ errs.addAll( model.validateMapping( item ) );
+ }
+ if (errs.size() > 0) {
+ for ( Iterator iter = errs.iterator(); iter.hasNext(); ) {
+ MappingError mapEr = (MappingError) iter.next();
+ createMarker( input.getFile(), mapEr.getMessage() + " From [" + mapEr.getTemplateText() + "]", -1 );
+ }
+ }
+ }
+
+ private void createMarker(final IResource res, final String message, final int lineNumber) {
+ try {
+ IWorkspaceRunnable r= new IWorkspaceRunnable() {
+ public void run(IProgressMonitor monitor) throws CoreException {
+ IMarker marker = res
+ .createMarker(IDroolsModelMarker.DROOLS_MODEL_PROBLEM_MARKER);
+ marker.setAttribute(IMarker.MESSAGE, message);
+ marker.setAttribute(IMarker.SEVERITY,
+ IMarker.SEVERITY_ERROR);
+ marker.setAttribute(IMarker.LINE_NUMBER, lineNumber);
+ }
+ };
+ res.getWorkspace().run(r, null, IWorkspace.AVOID_UPDATE, null);
+ } catch (CoreException e) {
+ DroolsIDEPlugin.log(e);
+ }
+ }
+
+ private void removeProblemsFor(IResource resource) {
+ try {
+ if (resource != null && resource.exists()) {
+ resource.deleteMarkers(
+ IDroolsModelMarker.DROOLS_MODEL_PROBLEM_MARKER, false,
+ IResource.DEPTH_INFINITE);
+ }
+ } catch (CoreException e) {
+ DroolsIDEPlugin.log(e);
+ }
+ }
+
void makeClean() {
this.dirty = false;
firePropertyChange( PROP_DIRTY );
|
|
From: <jbo...@li...> - 2006-04-13 03:31:57
|
Author: mic...@jb...
Date: 2006-04-12 23:31:52 -0400 (Wed, 12 Apr 2006)
New Revision: 3681
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/MappingError.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/NLMappingItem.java
Log:
JBRULES-88
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/MappingError.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/MappingError.java 2006-04-13 03:03:19 UTC (rev 3680)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/MappingError.java 2006-04-13 03:31:52 UTC (rev 3681)
@@ -41,15 +41,18 @@
private final int template;
private final int offset;
private final String token;
+ private String templateText;
public MappingError(int errorCode,
int template,
int offset,
- String token) {
+ String token,
+ String templateText) {
this.errorCode = errorCode;
this.template = template;
this.token = token;
this.offset = offset;
+ this.templateText = templateText;
}
/**
@@ -73,6 +76,13 @@
public int getTemplate() {
return template;
}
+
+ /**
+ * @return the original content.
+ */
+ public String getTemplateText() {
+ return templateText;
+ }
/**
* @inheritDoc
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/NLMappingItem.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/NLMappingItem.java 2006-04-13 03:03:19 UTC (rev 3680)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/NLMappingItem.java 2006-04-13 03:31:52 UTC (rev 3681)
@@ -96,14 +96,14 @@
result.add( new MappingError(MappingError.ERROR_UNUSED_TOKEN,
MappingError.TEMPLATE_NATURAL,
item.getNaturalTemplate().indexOf( token ),
- token) );
+ token, this.naturalTemplate) );
}
for(Iterator i = targetSet.iterator(); i.hasNext() ; ) {
String token = (String) i.next();
result.add( new MappingError(MappingError.ERROR_UNDECLARED_TOKEN,
MappingError.TEMPLATE_TARGET,
item.getTargetTemplate().indexOf( token ),
- token ) );
+ token, this.naturalTemplate ) );
}
}
return result;
@@ -129,7 +129,7 @@
result.add( new MappingError( MappingError.ERROR_INVALID_TOKEN,
MappingError.TEMPLATE_NATURAL,
natural1.start(),
- token));
+ token, this.naturalTemplate));
}
while(natural2.find()) {
@@ -137,7 +137,7 @@
result.add( new MappingError( MappingError.ERROR_UNMATCHED_BRACES,
MappingError.TEMPLATE_NATURAL,
natural2.start(),
- token));
+ token, this.naturalTemplate));
}
while(target1.find()) {
@@ -145,7 +145,7 @@
result.add( new MappingError( MappingError.ERROR_INVALID_TOKEN,
MappingError.TEMPLATE_TARGET,
target1.start(),
- token));
+ token, this.naturalTemplate));
}
while(target2.find()) {
@@ -153,7 +153,7 @@
result.add( new MappingError( MappingError.ERROR_UNMATCHED_BRACES,
MappingError.TEMPLATE_TARGET,
target2.start(),
- token));
+ token, this.naturalTemplate));
}
return result;
|
|
From: <jbo...@li...> - 2006-04-13 03:03:25
|
Author: mic...@jb...
Date: 2006-04-12 23:03:19 -0400 (Wed, 12 Apr 2006)
New Revision: 3680
Modified:
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/NLGrammar.java
labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/NLMappingItem.java
Log:
slight refactoring
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/NLGrammar.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/NLGrammar.java 2006-04-13 02:21:24 UTC (rev 3679)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/NLGrammar.java 2006-04-13 03:03:19 UTC (rev 3680)
@@ -27,9 +27,6 @@
private static final long serialVersionUID = 1L;
private List mappings = new ArrayList();
private static final Pattern itemPrefix = Pattern.compile( "\\[\\s*(when|then)\\s*\\].*" );
- private static final Pattern tokenPattern = Pattern.compile( "\\{(\\w*)\\}" );
- private static final Pattern invalidPattern1 = Pattern.compile( "\\{\\w*(\\z|[^\\}\\w])" );
- private static final Pattern invalidPattern2 = Pattern.compile( "[^\\{\\w]\\w*\\}" );
private String description;
@@ -165,101 +162,12 @@
* @return a List of MappingError's found or an empty list in case no one was found
*/
public List validateMapping(NLMappingItem item) {
- List errors = this.validateTokenUsage(item);
- errors.addAll( this.validateUnmatchingBraces( item ) );
+ List errors = item.validateTokenUsage();
+ errors.addAll( item.validateUnmatchingBraces() );
return errors;
}
- /**
- * Checks for tokens declared in the natural expression but not used in the
- * mapping and tokens used in the mapping but not declared in the natural
- * expression
- *
- * @param item
- * @return
- */
- private List validateTokenUsage(NLMappingItem item) {
- List result = new ArrayList();
- Matcher natural = tokenPattern.matcher( item.getNaturalTemplate() );
- Matcher target = tokenPattern.matcher( item.getTargetTemplate() );
- Set naturalSet = new HashSet();
- Set targetSet = new HashSet();
- while(natural.find()) {
- naturalSet.add( natural.group() );
- }
- while(target.find()) {
- targetSet.add( target.group() );
- }
- if( ! naturalSet.equals( targetSet )) {
- Set aux = new HashSet(naturalSet);
- naturalSet.removeAll( targetSet );
- targetSet.removeAll( aux );
-
- for(Iterator i = naturalSet.iterator(); i.hasNext() ; ) {
- String token = (String) i.next();
- result.add( new MappingError(MappingError.ERROR_UNUSED_TOKEN,
- MappingError.TEMPLATE_NATURAL,
- item.getNaturalTemplate().indexOf( token ),
- token) );
- }
- for(Iterator i = targetSet.iterator(); i.hasNext() ; ) {
- String token = (String) i.next();
- result.add( new MappingError(MappingError.ERROR_UNDECLARED_TOKEN,
- MappingError.TEMPLATE_TARGET,
- item.getTargetTemplate().indexOf( token ),
- token ) );
- }
- }
- return result;
- }
+
- /**
- * Checks for unmatched brackets and invalid tokens
- *
- * @param item
- * @return
- */
- private List validateUnmatchingBraces(NLMappingItem item) {
- List result = new ArrayList();
- Matcher natural1 = invalidPattern1.matcher( item.getNaturalTemplate() );
- Matcher natural2 = invalidPattern2.matcher( item.getNaturalTemplate() );
- Matcher target1 = invalidPattern1.matcher( item.getTargetTemplate() );
- Matcher target2 = invalidPattern2.matcher( item.getTargetTemplate() );
-
- while(natural1.find()) {
- String token = natural1.group();
- result.add( new MappingError( MappingError.ERROR_INVALID_TOKEN,
- MappingError.TEMPLATE_NATURAL,
- natural1.start(),
- token));
- }
-
- while(natural2.find()) {
- String token = natural2.group();
- result.add( new MappingError( MappingError.ERROR_UNMATCHED_BRACES,
- MappingError.TEMPLATE_NATURAL,
- natural2.start(),
- token));
- }
-
- while(target1.find()) {
- String token = target1.group();
- result.add( new MappingError( MappingError.ERROR_INVALID_TOKEN,
- MappingError.TEMPLATE_TARGET,
- target1.start(),
- token));
- }
-
- while(target2.find()) {
- String token = target2.group();
- result.add( new MappingError( MappingError.ERROR_UNMATCHED_BRACES,
- MappingError.TEMPLATE_TARGET,
- target2.start(),
- token));
- }
-
- return result;
- }
-
}
Modified: labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/NLMappingItem.java
===================================================================
--- labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/NLMappingItem.java 2006-04-13 02:21:24 UTC (rev 3679)
+++ labs/jbossrules/trunk/drools-compiler/src/main/java/org/drools/lang/dsl/template/NLMappingItem.java 2006-04-13 03:03:19 UTC (rev 3680)
@@ -1,6 +1,13 @@
package org.drools.lang.dsl.template;
import java.io.Serializable;
+import java.util.ArrayList;
+import java.util.HashSet;
+import java.util.Iterator;
+import java.util.List;
+import java.util.Set;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
/**
* This contains a single mapping from psuedo NL to a grammarTemplate.
@@ -14,6 +21,10 @@
private static final long serialVersionUID = 7185580607729787497L;
+ private static final Pattern tokenPattern = Pattern.compile( "\\{(\\w*)\\}" );
+ private static final Pattern invalidPattern1 = Pattern.compile( "\\{\\w*(\\z|[^\\}\\w])" );
+ private static final Pattern invalidPattern2 = Pattern.compile( "[^\\{\\w]\\w*\\}" );
+
private String naturalTemplate;
private String targetTemplate;
@@ -53,5 +64,99 @@
public String getScope() {
return this.scope;
}
+
+ /**
+ * Checks for tokens declared in the natural expression but not used in the
+ * mapping and tokens used in the mapping but not declared in the natural
+ * expression
+ *
+ * @param item
+ * @return
+ */
+ public List validateTokenUsage() {
+ NLMappingItem item = this;
+ List result = new ArrayList();
+ Matcher natural = tokenPattern.matcher( item.getNaturalTemplate() );
+ Matcher target = tokenPattern.matcher( item.getTargetTemplate() );
+ Set naturalSet = new HashSet();
+ Set targetSet = new HashSet();
+ while(natural.find()) {
+ naturalSet.add( natural.group() );
+ }
+ while(target.find()) {
+ targetSet.add( target.group() );
+ }
+ if( ! naturalSet.equals( targetSet )) {
+ Set aux = new HashSet(naturalSet);
+ naturalSet.removeAll( targetSet );
+ targetSet.removeAll( aux );
+
+ for(Iterator i = naturalSet.iterator(); i.hasNext() ; ) {
+ String token = (String) i.next();
+ result.add( new MappingError(MappingError.ERROR_UNUSED_TOKEN,
+ MappingError.TEMPLATE_NATURAL,
+ item.getNaturalTemplate().indexOf( token ),
+ token) );
+ }
+ for(Iterator i = targetSet.iterator(); i.hasNext() ; ) {
+ String token = (String) i.next();
+ result.add( new MappingError(MappingError.ERROR_UNDECLARED_TOKEN,
+ MappingError.TEMPLATE_TARGET,
+ item.getTargetTemplate().indexOf( token ),
+ token ) );
+ }
+ }
+ return result;
+ }
+
+ /**
+ * Checks for unmatched brackets and invalid tokens
+ *
+ * @param item
+ * @return
+ */
+ public List validateUnmatchingBraces() {
+ NLMappingItem item = this;
+ List result = new ArrayList();
+ Matcher natural1 = invalidPattern1.matcher( item.getNaturalTemplate() );
+ Matcher natural2 = invalidPattern2.matcher( item.getNaturalTemplate() );
+ Matcher target1 = invalidPattern1.matcher( item.getTargetTemplate() );
+ Matcher target2 = invalidPattern2.matcher( item.getTargetTemplate() );
+
+ while(natural1.find()) {
+ String token = natural1.group();
+ result.add( new MappingError( MappingError.ERROR_INVALID_TOKEN,
+ MappingError.TEMPLATE_NATURAL,
+ natural1.start(),
+ token));
+ }
+
+ while(natural2.find()) {
+ String token = natural2.group();
+ result.add( new MappingError( MappingError.ERROR_UNMATCHED_BRACES,
+ MappingError.TEMPLATE_NATURAL,
+ natural2.start(),
+ token));
+ }
+
+ while(target1.find()) {
+ String token = target1.group();
+ result.add( new MappingError( MappingError.ERROR_INVALID_TOKEN,
+ MappingError.TEMPLATE_TARGET,
+ target1.start(),
+ token));
+ }
+
+ while(target2.find()) {
+ String token = target2.group();
+ result.add( new MappingError( MappingError.ERROR_UNMATCHED_BRACES,
+ MappingError.TEMPLATE_TARGET,
+ target2.start(),
+ token));
+ }
+
+ return result;
+ }
+
}
|
|
From: <jbo...@li...> - 2006-04-13 02:16:59
|
Author: dam...@jb... Date: 2006-04-12 22:16:56 -0400 (Wed, 12 Apr 2006) New Revision: 3678 Added: labs/jbosslabs/branches/qa/jbosslabs/ Log: Branching trunk to qa for testing of JBoss Labs 1.1. Copied: labs/jbosslabs/branches/qa/jbosslabs (from rev 3677, labs/jbosslabs/trunk) |
|
From: <jbo...@li...> - 2006-04-13 02:16:13
|
Author: dam...@jb... Date: 2006-04-12 22:16:06 -0400 (Wed, 12 Apr 2006) New Revision: 3677 Removed: labs/jbosslabs/branches/qa/jbosslabs/ Log: I am just removing qa and I will rebranch from trunk. We're upgrading to 2.2 anyway. This begins the testing of Portal 2.2. |
|
From: <jbo...@li...> - 2006-04-12 22:13:13
|
Author: mar...@jb...
Date: 2006-04-12 18:13:08 -0400 (Wed, 12 Apr 2006)
New Revision: 3676
Modified:
labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LogicTransformer.java
Log:
-Added back in nested Exists/Nots
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-04-12 21:29:45 UTC (rev 3675)
+++ labs/jbossrules/trunk/drools-core/src/main/java/org/drools/rule/LogicTransformer.java 2006-04-12 22:13:08 UTC (rev 3676)
@@ -349,46 +349,96 @@
}
/**
- * This data structure is not valid (Exists (OR (A B)
+ * (Exist (OR (A B)
*
* <pre>
- * Exists
- * |
- * or
- * / \
- * a b
+ * Exist
+ * |
+ * or
+ * / \
+ * a b
* </pre>
*
+ * (Exist ( Not (a) Not (b)) )
+ *
+ * <pre>
+ * Exist
+ * / \
+ * Not Not
+ * | |
+ * a b
+ * </pre>
*/
class ExistOrTransformation
implements
OrTransformation {
public GroupElement transform(GroupElement exist) throws InvalidPatternException {
- throw new InvalidPatternException( "You cannot nest an OR within an Exists" );
+ if ( !(exist.getChildren( ).get( 0 ) instanceof Or) )
+ {
+ throw new RuntimeException( "ExistOrTransformation expected '" + Or.class.getName( ) + "' but instead found '" + exist.getChildren( ).get( 0 ).getClass( ).getName( ) + "'" );
+ }
+
+ /*
+ * we know a Not only ever has one child, and the previous algorithm
+ * has confirmed the child is an OR
+ */
+ Or or = (Or) exist.getChildren( ).get( 0 );
+ And and = new And( );
+ for ( Iterator it = or.getChildren( ).iterator( ); it.hasNext( ); )
+ {
+ Exists newExist = new Exists( );
+ newExist.addChild( it.next( ) );
+ and.addChild( newExist );
+ }
+ return and;
}
}
/**
- * This data structure is now valid
- *
* (Not (OR (A B)
*
* <pre>
- * Not
- * |
- * or
- * / \
- * a b
+ * Not
+ * |
+ * or
+ * / \
+ * a b
* </pre>
*
- */
- class NotOrTransformation
+ * (And ( Not (a) Exist (b)) )
+ *
+ * <pre>
+ * And
+ * / \
+ * Not Not
+ * | |
+ * a b
+ * </pre>
+ */
+ public class NotOrTransformation
implements
OrTransformation {
public GroupElement transform(GroupElement not) throws InvalidPatternException {
- throw new InvalidPatternException( "You cannot nest an OR within an Not" );
+ if ( !(not.getChildren( ).get( 0 ) instanceof Or) )
+ {
+ throw new RuntimeException( "NotOrTransformation expected '" + Or.class.getName( ) + "' but instead found '" + not.getChildren( ).get( 0 ).getClass( ).getName( ) + "'" );
+ }
+
+ /*
+ * we know a Not only ever has one child, and the previous algorithm
+ * has confirmed the child is an OR
+ */
+ Or or = (Or) not.getChildren( ).get( 0 );
+ And and = new And( );
+ for ( Iterator it = or.getChildren( ).iterator( ); it.hasNext( ); )
+ {
+ Not newNot = new Not( );
+ newNot.addChild( it.next( ) );
+ and.addChild( newNot );
+ }
+ return and;
}
}
|
Author: adamw
Date: 2006-04-12 17:29:45 -0400 (Wed, 12 Apr 2006)
New Revision: 3675
Added:
labs/jbosslabs/trunk/portal-extensions/forge-sar/
labs/jbosslabs/trunk/portal-extensions/forge-sar/src/
labs/jbosslabs/trunk/portal-extensions/forge-sar/src/META-INF/
labs/jbosslabs/trunk/portal-extensions/forge-sar/src/META-INF/jboss-service.xml
labs/jbosslabs/trunk/portal-extensions/labs.iml
Removed:
labs/jbosslabs/trunk/portal-extensions/forge-ear/
Modified:
labs/jbosslabs/trunk/portal-extensions/forge-common/maven.xml
labs/jbosslabs/trunk/portal-extensions/forge-kosmos/maven.xml
labs/jbosslabs/trunk/portal-extensions/forge-service/maven.xml
labs/jbosslabs/trunk/portal-extensions/forge-status/maven.xml
labs/jbosslabs/trunk/portal-extensions/forge-theme/maven.xml
labs/jbosslabs/trunk/portal-extensions/maven.xml
labs/jbosslabs/trunk/portal-extensions/project.properties
Log:
Deployment model change
Modified: labs/jbosslabs/trunk/portal-extensions/forge-common/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-common/maven.xml 2006-04-12 20:56:59 UTC (rev 3674)
+++ labs/jbosslabs/trunk/portal-extensions/forge-common/maven.xml 2006-04-12 21:29:45 UTC (rev 3675)
@@ -5,22 +5,22 @@
-->
<project xmlns:j="jelly:core" xmlns:ant="jelly:ant" xmlns:u="jelly:util">
<goal name="all">
-
+
</goal>
-
+
<goal name="clean">
- <attainGoal name="prj-clean" />
+ <attainGoal name="prj-clean" />
</goal>
<goal name="build">
- <attainGoal name="jar" />
+ <attainGoal name="jar" />
</goal>
-
+
<goal name="deploy">
- <ant:copy todir="../${forge.ear.dir}/target/${forge.ear.name}" flatten="true">
- <ant:fileset dir=".">
- <ant:filename name="target/*.jar" />
- </ant:fileset>
- </ant:copy>
+ <ant:copy todir="../${forge.sar.dir}/target/${forge.sar.name}" flatten="true">
+ <ant:fileset dir=".">
+ <ant:filename name="target/*.jar" />
+ </ant:fileset>
+ </ant:copy>
</goal>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-kosmos/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-kosmos/maven.xml 2006-04-12 20:56:59 UTC (rev 3674)
+++ labs/jbosslabs/trunk/portal-extensions/forge-kosmos/maven.xml 2006-04-12 21:29:45 UTC (rev 3675)
@@ -45,7 +45,7 @@
<ant:delete dir="${local.deploy.dir}/kosmos-portlet.war" />
<!-- Deploying new packages -->
- <ant:copy todir="../${forge.ear.dir}/target/${forge.ear.name}" overwrite="true">
+ <ant:copy todir="../${forge.sar.dir}/target" overwrite="true">
<ant:fileset dir="target">
<ant:filename name="kosmos*/**" />
</ant:fileset>
Added: labs/jbosslabs/trunk/portal-extensions/forge-sar/src/META-INF/jboss-service.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-sar/src/META-INF/jboss-service.xml 2006-04-12 20:56:59 UTC (rev 3674)
+++ labs/jbosslabs/trunk/portal-extensions/forge-sar/src/META-INF/jboss-service.xml 2006-04-12 21:29:45 UTC (rev 3675)
@@ -0,0 +1,3 @@
+<server>
+
+</server>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-service/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-service/maven.xml 2006-04-12 20:56:59 UTC (rev 3674)
+++ labs/jbosslabs/trunk/portal-extensions/forge-service/maven.xml 2006-04-12 21:29:45 UTC (rev 3675)
@@ -18,7 +18,7 @@
<goal name="deploy">
<ant:copy
- tofile="../${forge.ear.dir}/target/${forge.ear.name}/forge-service.ejb3"
+ tofile="../${forge.sar.dir}/target/${forge.sar.name}/forge-service.ejb3"
file="target/forge-service-1.0.jar" />
</goal>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-status/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-status/maven.xml 2006-04-12 20:56:59 UTC (rev 3674)
+++ labs/jbosslabs/trunk/portal-extensions/forge-status/maven.xml 2006-04-12 21:29:45 UTC (rev 3675)
@@ -8,8 +8,8 @@
<goal name="all">
<attainGoal name="prj-all" />
- <ant:copy tofile="${local.deploy.dir}/${forge.ear.name}/forge-status.ejb3" file="../${forge.ear.dir}/target/${forge.ear.name}/forge-status.ejb3" />
- <ant:copy tofile="${local.deploy.dir}/${forge.ear.name}/status-common.jar" file="../${forge.ear.dir}/target/${forge.ear.name}/status-common.jar" />
+ <ant:copy tofile="${local.deploy.dir}/${forge.sar.name}/forge-status.ejb3" file="../${forge.sar.dir}/target/${forge.sar.name}/forge-status.ejb3" />
+ <ant:copy tofile="${local.deploy.dir}/${forge.sar.name}/status-common.jar" file="../${forge.sar.dir}/target/${forge.sar.name}/status-common.jar" />
</goal>
<goal name="build">
@@ -20,8 +20,8 @@
<goal name="deploy">
<attainGoal name="prj-war-deploy" />
- <ant:copy tofile="../${forge.ear.dir}/target/${forge.ear.name}/forge-status.ejb3" file="target/forge-status-1.0.jar" />
- <ant:copy tofile="../${forge.ear.dir}/target/${forge.ear.name}/status-common.jar" file="target/status-common.jar" />
+ <ant:copy tofile="../${forge.sar.dir}/target/${forge.sar.name}/forge-status.ejb3" file="target/forge-status-1.0.jar" />
+ <ant:copy tofile="../${forge.sar.dir}/target/${forge.sar.name}/status-common.jar" file="target/status-common.jar" />
<ant:copy tofile="../binaries/maven-repo-addons/jboss/jars/status-common.jar" file="target/status-common.jar" />
</goal>
Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/maven.xml 2006-04-12 20:56:59 UTC (rev 3674)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/maven.xml 2006-04-12 21:29:45 UTC (rev 3675)
@@ -27,7 +27,7 @@
</goal>
<goal name="deploy">
- <ant:copy todir="../${forge.ear.dir}/target/${forge.ear.name}" overwrite="true">
+ <ant:copy todir="../${forge.sar.dir}/target" overwrite="true">
<ant:fileset dir=".">
<ant:include name="jbossForgeLayout.war/**" />
</ant:fileset>
Added: labs/jbosslabs/trunk/portal-extensions/labs.iml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/labs.iml 2006-04-12 20:56:59 UTC (rev 3674)
+++ labs/jbosslabs/trunk/portal-extensions/labs.iml 2006-04-12 21:29:45 UTC (rev 3675)
@@ -0,0 +1,54 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module version="4" relativePaths="true" type="JAVA_MODULE">
+ <component name="ModuleRootManager" />
+ <component name="NewModuleRootManager">
+ <output url="file://$MODULE_DIR$" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$" isTestSource="false" />
+ <excludeFolder url="file://$MODULE_DIR$/binaries" />
+ <excludeFolder url="file://$MODULE_DIR$/configuration" />
+ <excludeFolder url="file://$MODULE_DIR$/federation-register" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-ads" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-blog" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-common" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-contributor" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-ear" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-feeds" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-file-access" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-forums" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-freezone" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-jspwiki" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-kosmos" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-login" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-login-portlet" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-map" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-mapper" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-navigation" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-podcast" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-portal-attr" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-prj-downloads" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-prj-info" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-root-redirect" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-service" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-speller" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-status" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-theme" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-timetracker" />
+ <excludeFolder url="file://$MODULE_DIR$/forge-wiki" />
+ <excludeFolder url="file://$MODULE_DIR$/jboss-as-binaries" />
+ <excludeFolder url="file://$MODULE_DIR$/jbosswiki" />
+ <excludeFolder url="file://$MODULE_DIR$/mysql-connector" />
+ <excludeFolder url="file://$MODULE_DIR$/polls" />
+ <excludeFolder url="file://$MODULE_DIR$/portal-binaries" />
+ <excludeFolder url="file://$MODULE_DIR$/portal-default" />
+ <excludeFolder url="file://$MODULE_DIR$/portal-federation" />
+ <excludeFolder url="file://$MODULE_DIR$/primates" />
+ <excludeFolder url="file://$MODULE_DIR$/shotoku" />
+ <excludeFolder url="file://$MODULE_DIR$/shotoku-old" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntryProperties />
+ </component>
+</module>
+
Modified: labs/jbosslabs/trunk/portal-extensions/maven.xml
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/maven.xml 2006-04-12 20:56:59 UTC (rev 3674)
+++ labs/jbosslabs/trunk/portal-extensions/maven.xml 2006-04-12 21:29:45 UTC (rev 3675)
@@ -21,7 +21,7 @@
</goal>
<goal name="prj-war-deploy">
- <ant:copy todir="../${forge.ear.dir}/target/${forge.ear.name}" flatten="true" overwrite="true">
+ <ant:copy todir="../${forge.sar.dir}/target" flatten="true" overwrite="true">
<ant:fileset dir=".">
<ant:filename name="target/*.war" />
</ant:fileset>
@@ -38,53 +38,48 @@
<attainGoal name="clean" />
<attainGoal name="build" />
<attainGoal name="deploy" />
- <ant:copy todir="${local.deploy.dir}/${forge.ear.name}" flatten="true" overwrite="true">
+ <ant:copy todir="${local.deploy.dir}" flatten="true" overwrite="true">
<ant:fileset dir=".">
<ant:filename name="target/*.war" />
</ant:fileset>
</ant:copy>
- <ant:touch file="${local.deploy.dir}/${forge.ear.name}/META-INF/application.xml" />
</goal>
<!--
Internal-use goals
-->
- <!-- A goal that deploys the ear into the appserver -->
- <goal name="deploy-ear">
- <!-- Deleting the old ear -->
- <ant:delete dir="${local.deploy.dir}/${forge.ear.name}" />
+ <!-- A goal that deploys the sar into the appserver -->
+ <goal name="deploy-sar">
+ <!-- Deleting the old sar -->
+ <ant:delete dir="${local.deploy.dir}/${forge.sar.name}" />
<!-- Copying application.xml -->
<ant:copy
- file="${forge.ear.dir}/src/META-INF/application.xml"
- tofile="${forge.ear.dir}/target/${forge.ear.name}/META-INF/application.xml"
+ file="${forge.sar.dir}/src/META-INF/jboss-service.xml"
+ tofile="${forge.sar.dir}/target/${forge.sar.name}/META-INF/jboss-service.xml"
overwrite="true" />
<!-- Copying the dependency JARs -->
<ant:copy
- todir="${forge.ear.dir}/target/${forge.ear.name}"
+ todir="${forge.sar.dir}/target/${forge.sar.name}"
file="${maven.repo.local}/rome/jars/rome-0.7.jar"
overwrite="true" />
<ant:copy
- todir="${forge.ear.dir}/target/${forge.ear.name}"
+ todir="${forge.sar.dir}/target/${forge.sar.name}"
file="${maven.repo.local}/jdom/jars/jdom-1.0.jar"
overwrite="true" />
<ant:copy
- todir="${forge.ear.dir}/target/${forge.ear.name}"
+ todir="${forge.sar.dir}/target/${forge.sar.name}"
file="${maven.repo.local}/commons-collections/jars/commons-collections-3.1.jar"
overwrite="true" />
- <!-- Deploying the ear -->
+ <!-- Deploying the sar -->
<ant:copy todir="${local.deploy.dir}" overwrite="true">
- <ant:fileset dir="${forge.ear.dir}/target/${forge.ear}">
+ <ant:fileset dir="${forge.sar.dir}/target">
<ant:include name="**" />
</ant:fileset>
</ant:copy>
-
- <ant:touch>
- <ant:fileset dir="${local.deploy.dir}/${forge.ear.name}" />
- </ant:touch>
</goal>
<!-- Copies necessary jars to the repository -->
@@ -141,7 +136,7 @@
Goals available in a project:
- all - will do clean, build, deploy of an individual project. Re-deploying works for projects contained
- in jboss-forge.ear, for others, it may not work.
+ in jboss-forge.sar, for others, it may not work.
</echo>
</goal>
@@ -172,7 +167,7 @@
2. Copy an appropriate portal-*-ds.xml to the same dir (these files can be found in
portal-binaries/to-copy-head/setup)
3. Modify the following files:
- - ${local.deploy.dir}/portal-forums.ear/portal-forums.sar/conf/hibernate/hibernate.cfg.xml
+ - ${local.deploy.dir}/portal-forums.sar/portal-forums.sar/conf/hibernate/hibernate.cfg.xml
- ${local.deploy.dir}/jboss-portal.sar/conf/hibernate/hibernate.cfg.xml.
to use an appropriate dialect.
@@ -182,7 +177,7 @@
</goal>
<goal name="clean">
- <ant:delete dir="${forge.ear.dir}/target" />
+ <ant:delete dir="${forge.sar.dir}/target" />
<j:set var="goal" value="clean" />
<attainGoal name="multiproject:goal" />
</goal>
@@ -194,22 +189,22 @@
</goal>
<goal name="deploy">
- <ant:delete dir="${local.deploy.dir}/${forge.ear.name}" />
+ <ant:delete dir="${local.deploy.dir}/${forge.sar.name}" />
<j:set var="goal" value="deploy" />
<attainGoal name="multiproject:goal" />
- <attainGoal name="deploy-ear" />
+ <attainGoal name="deploy-sar" />
</goal>
<!-- Convenience goal that does clean, build, deploy -->
<goal name="all">
- <ant:delete dir="${local.deploy.dir}/${forge.ear.name}" />
- <ant:delete dir="${forge.ear.dir}/target" />
+ <ant:delete dir="${local.deploy.dir}/${forge.sar.name}" />
+ <ant:delete dir="${forge.sar.dir}/target" />
<attainGoal name="prepare-repo" />
<j:set var="goal" value="clean,build,deploy" />
<attainGoal name="multiproject:goal" />
- <attainGoal name="deploy-ear" />
+ <attainGoal name="deploy-sar" />
</goal>
</project>
Modified: labs/jbosslabs/trunk/portal-extensions/project.properties
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/project.properties 2006-04-12 20:56:59 UTC (rev 3674)
+++ labs/jbosslabs/trunk/portal-extensions/project.properties 2006-04-12 21:29:45 UTC (rev 3675)
@@ -4,8 +4,8 @@
jboss.jmx.deploy=HtmlAdaptor?action=invokeOp&name=portal:service=Deployer,type=Adapter&methodIndex=1
jboss.jmx.undeploy=HtmlAdaptor?action=invokeOp&name=portal:service=Deployer,type=Adapter&methodIndex=2
-forge.ear.name=jboss-forge.ear
-forge.ear.dir=forge-ear
+forge.sar.name=w-jboss-forge.sar
+forge.sar.dir=forge-sar
## Specify these properties if you are behind a proxy server
##maven.proxy.host
|
|
From: <jbo...@li...> - 2006-04-12 20:57:04
|
Author: dam...@jb... Date: 2006-04-12 16:56:59 -0400 (Wed, 12 Apr 2006) New Revision: 3674 Added: labs/trailblazers/trunk/ Removed: trunk/labs/trailblazers/ Log: Moving trailblazers. Copied: labs/trailblazers/trunk (from rev 3673, trunk/labs/trailblazers) |
|
From: <jbo...@li...> - 2006-04-12 20:56:32
|
Author: dam...@jb... Date: 2006-04-12 16:56:30 -0400 (Wed, 12 Apr 2006) New Revision: 3673 Added: labs/trailblazers/tags/ Log: Moving trailblazers. |
|
From: <jbo...@li...> - 2006-04-12 20:56:29
|
Author: dam...@jb... Date: 2006-04-12 16:56:25 -0400 (Wed, 12 Apr 2006) New Revision: 3672 Added: labs/trailblazers/branches/ Log: Moving trailblazers. |
|
From: <jbo...@li...> - 2006-04-12 20:56:21
|
Author: dam...@jb... Date: 2006-04-12 16:56:18 -0400 (Wed, 12 Apr 2006) New Revision: 3671 Added: labs/trailblazers/ Log: Moving trailblazers. |
|
From: <jbo...@li...> - 2006-04-12 20:39:34
|
Author: dam...@jb... Date: 2006-04-12 16:39:31 -0400 (Wed, 12 Apr 2006) New Revision: 3670 Removed: trunk/labs/reportingservices/ Log: Obsolete. |
|
From: <jbo...@li...> - 2006-04-12 20:35:51
|
Author: szimano
Date: 2006-04-12 16:35:43 -0400 (Wed, 12 Apr 2006)
New Revision: 3669
Modified:
labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/status-common.jar
labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp
Log:
jasper error
Modified: labs/jbosslabs/trunk/portal-extensions/binaries/maven-repo-addons/jboss/jars/status-common.jar
===================================================================
(Binary files differ)
Modified: labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp
===================================================================
--- labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2006-04-12 20:31:52 UTC (rev 3668)
+++ labs/jbosslabs/trunk/portal-extensions/forge-theme/jbossForgeLayout.war/layouts/jbossForge.jsp 2006-04-12 20:35:43 UTC (rev 3669)
@@ -64,7 +64,7 @@
<ul>
<li><a href="<%
- String url = request.getRequestURL().append((request.getQueryString().length() > 0) ? "?" + request.getQueryString() : "").toString();
+ String url = request.getRequestURL().append((request.getQueryString() != null && request.getQueryString().length() > 0) ? "?" + request.getQueryString() : "").toString();
if (url.contains("/authsec") || url.contains("/auth")) {
out.print(url);
|
|
From: <jbo...@li...> - 2006-04-12 20:31:55
|
Author: dam...@jb... Date: 2006-04-12 16:31:52 -0400 (Wed, 12 Apr 2006) New Revision: 3668 Added: labs/jbossbuild/trunk/ Removed: trunk/labs/jbossbuild/ Log: Moving jbossbuild. Copied: labs/jbossbuild/trunk (from rev 3667, trunk/labs/jbossbuild) |
|
From: <jbo...@li...> - 2006-04-12 20:30:53
|
Author: dam...@jb... Date: 2006-04-12 16:30:47 -0400 (Wed, 12 Apr 2006) New Revision: 3667 Added: labs/jbossbuild/tags/ Log: Moving jbossbuild. |
|
From: <jbo...@li...> - 2006-04-12 20:30:45
|
Author: dam...@jb... Date: 2006-04-12 16:30:39 -0400 (Wed, 12 Apr 2006) New Revision: 3666 Added: labs/jbossbuild/branches/ Log: Moving jbossbuild. |
|
From: <jbo...@li...> - 2006-04-12 20:30:35
|
Author: dam...@jb... Date: 2006-04-12 16:30:31 -0400 (Wed, 12 Apr 2006) New Revision: 3665 Added: labs/jbossbuild/ Log: Moving jbossbuild. |
|
From: <jbo...@li...> - 2006-04-12 20:02:21
|
Author: dam...@jb... Date: 2006-04-12 16:02:18 -0400 (Wed, 12 Apr 2006) New Revision: 3662 Added: labs/jbosslabs/branches/qa/jbosslabs/ Removed: labs/jbosslabs/branches/qa/forge/ Log: Name change. Copied: labs/jbosslabs/branches/qa/jbosslabs (from rev 3661, labs/jbosslabs/branches/qa/forge) |
|
From: <jbo...@li...> - 2006-04-12 20:02:06
|
Author: dam...@jb... Date: 2006-04-12 16:02:01 -0400 (Wed, 12 Apr 2006) New Revision: 3661 Removed: labs/jbosslabs/branches/qa/labs/ Log: Obsolete. |
|
From: <jbo...@li...> - 2006-04-12 20:01:29
|
Author: dam...@jb... Date: 2006-04-12 16:01:23 -0400 (Wed, 12 Apr 2006) New Revision: 3660 Added: labs/jbosslabs/branches/prod/jbosslabs/ Removed: labs/jbosslabs/branches/prod/forge/ Log: Name change. Copied: labs/jbosslabs/branches/prod/jbosslabs (from rev 3659, labs/jbosslabs/branches/prod/forge) |
550 messages has been excluded from this view by a project administrator.
