July 2009 - jbpm-commits - Jboss List Archives

JBoss JBPM SVN: r5374 - in jbpm4/trunk/modules: test-db/src/test/java/org/jbpm/test/task and 1 other directory.

by do-not-reply＠jboss.org

Author: koen.aers(a)jboss.com Date: 2009-07-29 09:06:25 -0400 (Wed, 29 Jul 2009) New Revision: 5374 Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskQueryTest.java Log: JBPM-2418: fix the duedate property name Modified: jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java =================================================================== --- jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java 2009-07-29 12:46:55 UTC (rev 5373) +++ jbpm4/trunk/modules/api/src/main/java/org/jbpm/api/TaskQuery.java 2009-07-29 13:06:25 UTC (rev 5374) @@ -37,9 +37,9 @@ /** assignee property to be used as property in {@link #orderAsc(String)} and {@link #orderDesc(String)} */ String PROPERTY_ASSIGNEE = "assignee"; /** createdate property to be used as property in {@link #orderAsc(String)} and {@link #orderDesc(String)} */ - String PROPERTY_CREATEDATE = "create"; + String PROPERTY_CREATEDATE = "createTime"; /** duedate property to be used as property in {@link #orderAsc(String)} and {@link #orderDesc(String)} */ - String PROPERTY_DUEDATE = "dueDate"; + String PROPERTY_DUEDATE = "duedate"; /** priority property to be used as property in {@link #orderAsc(String)} and {@link #orderDesc(String)} */ String PROPERTY_PRIORITY = "priority"; /** progress property to be used as property in {@link #orderAsc(String)} and {@link #orderDesc(String)} */ Modified: jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskQueryTest.java =================================================================== --- jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskQueryTest.java 2009-07-29 12:46:55 UTC (rev 5373) +++ jbpm4/trunk/modules/test-db/src/test/java/org/jbpm/test/task/TaskQueryTest.java 2009-07-29 13:06:25 UTC (rev 5374) @@ -21,6 +21,7 @@ */ package org.jbpm.test.task; +import java.util.Date; import java.util.List; import org.jbpm.api.TaskQuery; @@ -32,6 +33,34 @@ * @author Tom Baeyens */ public class TaskQueryTest extends JbpmTestCase { + + public void testPropertyNames() { + Task task = taskService.newTask(); + task.setName("write task query test"); + task.setAssignee("koen"); + task.setPriority(Integer.MAX_VALUE); + task.setDescription("make sure the test fails if property names are incorrect"); + task.setDuedate(new Date()); + String writeTestTaskId = taskService.saveTask(task); + + TaskQuery taskQuery = taskService.createTaskQuery(); + + checkProperty(taskQuery, task, TaskQuery.PROPERTY_ASSIGNEE); + checkProperty(taskQuery, task, TaskQuery.PROPERTY_CREATEDATE); + checkProperty(taskQuery, task, TaskQuery.PROPERTY_DUEDATE); + checkProperty(taskQuery, task, TaskQuery.PROPERTY_NAME); + checkProperty(taskQuery, task, TaskQuery.PROPERTY_PRIORITY); + checkProperty(taskQuery, task, TaskQuery.PROPERTY_PROGRESS); + + taskService.deleteTaskCascade(writeTestTaskId); + } + + private void checkProperty(TaskQuery taskQuery, Task task, String propertyName) { + List<Task> taskList = taskQuery.orderAsc(propertyName).list(); + assertNotNull(taskList); + assertContainsTask(taskList, task.getName()); + assertEquals(1, taskList.size()); + } public void testSimplestTaskQuery() { Task task = taskService.newTask();

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r5373 - in projects/gwt-console/branches/sam/sam/server: src/main/webapp and 1 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-07-29 08:46:55 -0400 (Wed, 29 Jul 2009) New Revision: 5373 Added: projects/gwt-console/branches/sam/sam/server/src/main/webapp/index.html Modified: projects/gwt-console/branches/sam/sam/server/pom.xml projects/gwt-console/branches/sam/sam/server/src/main/webapp/WEB-INF/web.xml Log: Fix server module, first cut Modified: projects/gwt-console/branches/sam/sam/server/pom.xml =================================================================== --- projects/gwt-console/branches/sam/sam/server/pom.xml 2009-07-29 12:44:58 UTC (rev 5372) +++ projects/gwt-console/branches/sam/sam/server/pom.xml 2009-07-29 12:46:55 UTC (rev 5373) @@ -25,14 +25,12 @@ <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-common</artifactId> <version>${version}</version> - <scope>provided</scope> </dependency> <dependency> <groupId>org.jboss.bpm</groupId> <artifactId>gwt-console-rpc</artifactId> - <version>${version}</version> - <scope>provided</scope> + <version>${version}</version> </dependency>  Modified: projects/gwt-console/branches/sam/sam/server/src/main/webapp/WEB-INF/web.xml =================================================================== --- projects/gwt-console/branches/sam/sam/server/src/main/webapp/WEB-INF/web.xml 2009-07-29 12:44:58 UTC (rev 5372) +++ projects/gwt-console/branches/sam/sam/server/src/main/webapp/WEB-INF/web.xml 2009-07-29 12:46:55 UTC (rev 5373) @@ -15,20 +15,6 @@ <param-value>/rs</param-value> </context-param> - <context-param> - <param-name>resteasy.providers</param-name> - <param-value>org.jboss.bpm.report.FileWriter</param-value> - </context-param> - - <filter> - <filter-name>gwtJSON</filter-name> - <filter-class>org.jboss.bpm.console.server.util.GWTJsonFilter</filter-class> - </filter> - <filter-mapping> - <filter-name>gwtJSON</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - <listener> <listener-class> org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap Added: projects/gwt-console/branches/sam/sam/server/src/main/webapp/index.html =================================================================== --- projects/gwt-console/branches/sam/sam/server/src/main/webapp/index.html (rev 0) +++ projects/gwt-console/branches/sam/sam/server/src/main/webapp/index.html 2009-07-29 12:46:55 UTC (rev 5373) @@ -0,0 +1,13 @@ +<html> +<body style='font-family: sans-serif; font-size:10pt;'> + +<h1>SAM Console Server</h1> + +<h2>Published URL's</h2> +You can find a list of resources <a href="/activity-monitor/rs/server/resources">here</a>. + +<h2>Problems?</h2> +Please post any questions to the <a href="http://www.jboss.org/index.html?module=bb&op=viewforum&f=295">gwt-console developer forum</a>. + +</body> +</html> \ No newline at end of file

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r5372 - jbpm4/trunk.

by do-not-reply＠jboss.org

Author: koen.aers(a)jboss.com Date: 2009-07-29 08:44:58 -0400 (Wed, 29 Jul 2009) New Revision: 5372 Modified: jbpm4/trunk/pom.xml Log: gpd dependency update: 4.1-SNAPSHOT Modified: jbpm4/trunk/pom.xml =================================================================== --- jbpm4/trunk/pom.xml 2009-07-29 12:42:15 UTC (rev 5371) +++ jbpm4/trunk/pom.xml 2009-07-29 12:44:58 UTC (rev 5372) @@ -49,7 +49,7 @@ <cactus.version>13-1.7.1</cactus.version> <freemarker.version>2.3.15</freemarker.version> <gwt.console.version>1.0.1-SNAPSHOT</gwt.console.version> - <jbpm.gpd.version>4.0.0-SNAPSHOT</jbpm.gpd.version> + <jbpm.gpd.version>4.1-SNAPSHOT</jbpm.gpd.version> <hibernate.version>3.3.1.GA</hibernate.version> <slf4j.version>1.5.2</slf4j.version> <hsqldb.version>1.8.0.7</hsqldb.version>

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r5371 - in projects/gwt-console/branches/sam: common and 16 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-07-29 08:42:15 -0400 (Wed, 29 Jul 2009) New Revision: 5371 Added: projects/gwt-console/branches/sam/common/ projects/gwt-console/branches/sam/common/common.iml projects/gwt-console/branches/sam/common/pom.xml projects/gwt-console/branches/sam/common/src/ projects/gwt-console/branches/sam/common/src/main/ projects/gwt-console/branches/sam/common/src/main/java/ projects/gwt-console/branches/sam/common/src/main/java/org/ projects/gwt-console/branches/sam/common/src/main/java/org/jboss/ projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/ projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/ projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/ projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/gson/ projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/util/ projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/util/RsComment.java projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/InfoFacade.java projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/UserMgmtFacade.java Removed: projects/gwt-console/branches/sam/server/server-core/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java projects/gwt-console/branches/sam/server/server-core/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java projects/gwt-console/branches/sam/server/server-core/src/main/java/org/jboss/bpm/console/server/util/RsComment.java projects/gwt-console/branches/sam/server/server-core/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java Modified: projects/gwt-console/branches/sam/gwt-parent.iml projects/gwt-console/branches/sam/pom.xml projects/gwt-console/branches/sam/sam/sam-toplevel.iml projects/gwt-console/branches/sam/sam/server/pom.xml projects/gwt-console/branches/sam/sam/server/sam-server.iml projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/ConsoleServerApplication.java projects/gwt-console/branches/sam/server/server-core/pom.xml Log: Create common module Added: projects/gwt-console/branches/sam/common/common.iml =================================================================== --- projects/gwt-console/branches/sam/common/common.iml (rev 0) +++ projects/gwt-console/branches/sam/common/common.iml 2009-07-29 12:42:15 UTC (rev 5371) @@ -0,0 +1,86 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module-library"> + <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> +</module> + Added: projects/gwt-console/branches/sam/common/pom.xml =================================================================== --- projects/gwt-console/branches/sam/common/pom.xml (rev 0) +++ projects/gwt-console/branches/sam/common/pom.xml 2009-07-29 12:42:15 UTC (rev 5371) @@ -0,0 +1,63 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <name>JBoss BPM - GWT Console (Common)</name> + <groupId>org.jboss.bpm</groupId> + <artifactId>gwt-console-common</artifactId> + <packaging>jar</packaging> + +  + <parent> + <groupId>org.jboss.bpm</groupId> + <artifactId>gwt-console-parent</artifactId> + <version>1.0.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <dependencies> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jaxrs</artifactId> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + <exclusion> + <groupId>tjws</groupId> + <artifactId>webserver</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </dependency> + </dependencies> +</project> Copied: projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java (from rev 5368, projects/gwt-console/branches/sam/server/server-core/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java) =================================================================== --- projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java (rev 0) +++ projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java 2009-07-29 12:42:15 UTC (rev 5371) @@ -0,0 +1,40 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.server.gson; + +import com.google.gson.Gson; +import com.google.gson.GsonBuilder; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class GsonFactory +{ + public static Gson createInstance() + { + Gson gson = new GsonBuilder() + .setDateFormat("yyyy-MM-dd HH:mm:ss") + .registerTypeAdapter(java.sql.Timestamp.class, new SQLDateTypeAdapter()) + .create(); + return gson; + } +} Copied: projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java (from rev 5368, projects/gwt-console/branches/sam/server/server-core/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java) =================================================================== --- projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java (rev 0) +++ projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java 2009-07-29 12:42:15 UTC (rev 5371) @@ -0,0 +1,69 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.server.gson; + +import com.google.gson.*; + +import java.util.Date; +import java.text.*; +import java.lang.reflect.Type; + + +/** + * A default type adapter for a {@link java.util.Date} object.<br> + * Create a GSON instance that can serialize/deserialize "java.util.Date" objects: + * <pre> + * Gson gson = new GsonBuilder() + * .registerTypeAdapter(new DateTypeAdapter()) + * .create(); + * </pre> + * + * @author Joel Leitch + */ +public class SQLDateTypeAdapter implements JsonSerializer<java.sql.Timestamp>, JsonDeserializer<Date> +{ + private final DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); + + public JsonElement serialize(java.sql.Timestamp src, Type typeOfSrc, JsonSerializationContext context) + { + String dateFormatAsString = format.format(src); + return new JsonPrimitive(dateFormatAsString); + } + + public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) + throws JsonParseException + { + if (!(json instanceof JsonPrimitive)) { + throw new JsonParseException("The date should be a string value"); + } + + try + { + return format.parse(json.getAsString()); + } + catch (ParseException e) + { + throw new JsonParseException(e); + } + + } +} Added: projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/util/RsComment.java =================================================================== --- projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/util/RsComment.java (rev 0) +++ projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/util/RsComment.java 2009-07-29 12:42:15 UTC (rev 5371) @@ -0,0 +1,29 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.server.util; + +(a)java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD}) @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) +public @interface RsComment { + + java.lang.String title(); + java.lang.String description(); +} \ No newline at end of file Added: projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java =================================================================== --- projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java (rev 0) +++ projects/gwt-console/branches/sam/common/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java 2009-07-29 12:42:15 UTC (rev 5371) @@ -0,0 +1,166 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.bpm.console.server.util; + +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Consumes; +import javax.ws.rs.Produces; +import java.lang.reflect.Method; +import java.util.ArrayList; +import java.util.List; +import java.util.Date; + +/** + * Creates HTML documention for JAX-RS resource classes. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class RsDocBuilder +{ + private String webContext; + private Class[] rootResources; + + public RsDocBuilder(String webContext, Class[] rootResources) + { + this.rootResources = rootResources; + this.webContext = webContext.startsWith("/") ? webContext : "/"+webContext; + } + + public String getWebContext() + { + return webContext; + } + + public Class[] getRootResources() + { + return rootResources; + } + + private StringBuffer build(Class root) + { + Path rootPath = (Path)root.getAnnotation(Path.class); + RsComment rootComment = (RsComment)root.getAnnotation(RsComment.class); + + List<Representation> representations = new ArrayList<Representation>(); + + for(Method m : root.getDeclaredMethods()) + { + Path resPath = m.getAnnotation(Path.class); + if(resPath!=null) + { + Representation r = new Representation(); + + r.path = resPath.value(); + r.httpMethod = m.getAnnotation(GET.class)!=null ? "GET" : "POST"; // currently limited to those + r.consume = (m.getAnnotation(Consumes.class)!=null) ? + arrayToString(m.getAnnotation(Consumes.class).value()) : "*/*"; + r.produce = (m.getAnnotation(Produces.class)!=null) ? + arrayToString(m.getAnnotation(Produces.class).value()) : "*/*"; + representations.add(r); + } + } + + StringBuffer sb = new StringBuffer(); + + if(rootComment!=null) + { + sb.append("<tr>"); + sb.append("<td colspan=5 style='border-bottom:1px solid black;'>"); + sb.append("<b>").append(rootComment.title()).append("</b>").append("<br>"); + sb.append("<i>").append(rootComment.description()).append("</i>"); + sb.append("</td>"); + sb.append("</tr>"); + } + + for(Representation r : representations) + { + sb.append("<tr>"); + sb.append("<td>").append(r.httpMethod.toUpperCase()).append("</td>"); + sb.append("<td>").append(buildPath(rootPath.value(),r.path)).append("</td>"); + sb.append("<td>").append("").append("</td>"); // description + sb.append("<td>").append(r.consume).append("</td>"); + sb.append("<td>").append(r.produce).append("</td>"); + sb.append("</tr>"); + } + + sb.append("<tr><td colspan=5> </td></tr>"); + + return sb; + } + + private String arrayToString(String[] arr) + { + StringBuffer sb = new StringBuffer(); + for(int i=0; i<arr.length; i++) + { + sb.append(arr[i]); + if(i<arr.length-1) + sb.append(","); + } + return sb.toString(); + } + + private String buildPath(String root, String resourcePath) + { + StringBuffer sb = new StringBuffer(); + sb.append(webContext); + sb.append("/").append(root).append("/"); + sb.append(resourcePath); + return sb.toString(); + } + + public StringBuffer build() + { + StringBuffer sb = new StringBuffer(); + sb.append("<html>").append("<body style='font-family: sans-serif; font-size:10pt;'>"); + sb.append(""); + sb.append("<table style='margin-top:10px;' width='100%'>"); + + sb.append("<tr>"); + sb.append("<th>").append("Method").append("</th>"); + sb.append("<th>").append("Path").append("</th>"); + sb.append("<th>").append("Description").append("</th>"); // description + sb.append("<th>").append("Consumes").append("</th>"); + sb.append("<th>").append("Produces").append("</th>"); + sb.append("</tr>"); + + for(Class c : rootResources) + { + sb.append( + build(c).toString() + ); + } + sb.append("</table>"); + sb.append("</body>").append("<html>"); + return sb; + + } + + private class Representation + { + String description,title = ""; + String consume,produce = ""; + String path; + String httpMethod; + } +} Modified: projects/gwt-console/branches/sam/gwt-parent.iml =================================================================== --- projects/gwt-console/branches/sam/gwt-parent.iml 2009-07-29 12:08:11 UTC (rev 5370) +++ projects/gwt-console/branches/sam/gwt-parent.iml 2009-07-29 12:42:15 UTC (rev 5371) @@ -4,6 +4,7 @@ <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/common/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/gui/profiles/drools/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/gui/profiles/drools/src/main/resources" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/gui/profiles/jbpm/src/main/java" isTestSource="false" /> Modified: projects/gwt-console/branches/sam/pom.xml =================================================================== --- projects/gwt-console/branches/sam/pom.xml 2009-07-29 12:08:11 UTC (rev 5370) +++ projects/gwt-console/branches/sam/pom.xml 2009-07-29 12:42:15 UTC (rev 5371) @@ -42,6 +42,7 @@ <module>server</module> <module>gui</module> <module>sam</module> + <module>common</module> </modules> <dependencyManagement> Modified: projects/gwt-console/branches/sam/sam/sam-toplevel.iml =================================================================== --- projects/gwt-console/branches/sam/sam/sam-toplevel.iml 2009-07-29 12:08:11 UTC (rev 5370) +++ projects/gwt-console/branches/sam/sam/sam-toplevel.iml 2009-07-29 12:42:15 UTC (rev 5371) @@ -208,15 +208,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" /> @@ -273,15 +264,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: javax.xml:jaxb-impl:jar:2.1:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/jaxb-impl/2.1/jaxb-impl-2.1.jar!/" /> @@ -327,15 +309,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" /> Modified: projects/gwt-console/branches/sam/sam/server/pom.xml =================================================================== --- projects/gwt-console/branches/sam/sam/server/pom.xml 2009-07-29 12:08:11 UTC (rev 5370) +++ projects/gwt-console/branches/sam/sam/server/pom.xml 2009-07-29 12:42:15 UTC (rev 5371) @@ -16,13 +16,25 @@  <properties> - <report.server.version>1.0.0-SNAPSHOT</report.server.version> - <json-lib.version>2.2.3</json-lib.version> + <report.server.version>1.0.0-SNAPSHOT</report.server.version> </properties> <dependencies>  + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>gwt-console-common</artifactId> + <version>${version}</version> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>gwt-console-rpc</artifactId> + <version>${version}</version> + <scope>provided</scope> + </dependency> +  <dependency> <groupId>com.google.gwt</groupId> @@ -131,13 +143,8 @@ <groupId>com.google.code.gson</groupId> <artifactId>gson</artifactId> </dependency> + <dependency> - <groupId>net.sf.json-lib</groupId> - <artifactId>json-lib</artifactId> - <version>${json-lib.version}</version> - <scope>test</scope> - </dependency> - <dependency> <groupId>junit</groupId> <artifactId>junit</artifactId> <version>${junit.version}</version> @@ -157,10 +164,10 @@ <scope>provided</scope> </dependency> <dependency> - <groupId>javax.xml</groupId> - <artifactId>jaxb-impl</artifactId> - <scope>provided</scope> - </dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxb-impl</artifactId> + <scope>provided</scope> + </dependency> </dependencies> <build> Modified: projects/gwt-console/branches/sam/sam/server/sam-server.iml =================================================================== --- projects/gwt-console/branches/sam/sam/server/sam-server.iml 2009-07-29 12:08:11 UTC (rev 5370) +++ projects/gwt-console/branches/sam/sam/server/sam-server.iml 2009-07-29 12:42:15 UTC (rev 5371) @@ -9,6 +9,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module-library"> <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile"> <CLASSES> @@ -55,15 +56,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> @@ -91,17 +83,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" /> @@ -167,24 +148,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" /> @@ -221,15 +184,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> Modified: projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/ConsoleServerApplication.java =================================================================== --- projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/ConsoleServerApplication.java 2009-07-29 12:08:11 UTC (rev 5370) +++ projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/ConsoleServerApplication.java 2009-07-29 12:42:15 UTC (rev 5371) @@ -36,7 +36,9 @@ public ConsoleServerApplication() { - + singletons.add(new InfoFacade()); + singletons.add(new UserMgmtFacade()); + } @Override Added: projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/InfoFacade.java =================================================================== --- projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/InfoFacade.java (rev 0) +++ projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/InfoFacade.java 2009-07-29 12:42:15 UTC (rev 5371) @@ -0,0 +1,72 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.sam.console.server; + +import com.google.gson.Gson; + +import javax.ws.rs.core.Context; +import javax.ws.rs.core.Response; +import javax.ws.rs.Path; +import javax.ws.rs.GET; +import javax.ws.rs.Produces; +import javax.servlet.http.HttpServletRequest; +import org.jboss.bpm.console.server.util.*; +import org.jboss.bpm.console.server.gson.GsonFactory; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +@Path("server") +@RsComment( + title = "Server Info", + description = "General REST server information" +) +public class InfoFacade +{ + + @GET + @Path("resources") + @Produces("text/html") + public Response getPublishedUrls( + @Context + HttpServletRequest request + ) + { + final Class[] rootResources = new Class[] + { + InfoFacade.class, + UserMgmtFacade.class + }; + + RsDocBuilder rsDocBuilder = new RsDocBuilder(request.getContextPath(),rootResources); + StringBuffer sb = rsDocBuilder.build(); + return Response.ok(sb.toString()).build(); + } + + private Response createJsonResponse(Object wrapper) + { + Gson gson = GsonFactory.createInstance(); + String json = gson.toJson(wrapper); + return Response.ok(json).type("application/json").build(); + } +} + Added: projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/UserMgmtFacade.java =================================================================== --- projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/UserMgmtFacade.java (rev 0) +++ projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/UserMgmtFacade.java 2009-07-29 12:42:15 UTC (rev 5371) @@ -0,0 +1,84 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.sam.console.server; + +import com.google.gson.Gson; +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.jboss.bpm.console.client.model.RoleAssignmentRef; +import org.jboss.bpm.console.client.model.RoleAssignmentRefWrapper; +import org.jboss.bpm.console.server.gson.GsonFactory; +import org.jboss.bpm.console.server.util.RsComment; + +import javax.servlet.http.HttpServletRequest; +import javax.ws.rs.GET; +import javax.ws.rs.Path; +import javax.ws.rs.Produces; +import javax.ws.rs.QueryParam; +import javax.ws.rs.core.Context; +import javax.ws.rs.core.Response; +import java.util.ArrayList; +import java.util.List; +import java.util.StringTokenizer; + +/** + * REST server module for accessing user related data. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +@Path("identity") +@RsComment( + title = "User management", + description = "Manage user and groups" +) +public class UserMgmtFacade +{ + private static final Log log = LogFactory.getLog(UserMgmtFacade.class); + + @GET + @Path("user/roles") + @Produces("application/json") + public Response getRolesForJAASPrincipal( + @Context + HttpServletRequest request, + @QueryParam("roleCheck") + String roleCheck + ) + { + List<RoleAssignmentRef> actualRoles = new ArrayList<RoleAssignmentRef>(); + + StringTokenizer tok = new StringTokenizer(roleCheck, ","); + while(tok.hasMoreTokens()) + { + String possibleRole = tok.nextToken(); + actualRoles.add( new RoleAssignmentRef(possibleRole, true)); + } + return createJsonResponse( new RoleAssignmentRefWrapper(actualRoles)); + } + + private Response createJsonResponse(Object wrapper) + { + Gson gson = GsonFactory.createInstance(); + String json = gson.toJson(wrapper); + return Response.ok(json).type("application/json").build(); + } +} Modified: projects/gwt-console/branches/sam/server/server-core/pom.xml =================================================================== --- projects/gwt-console/branches/sam/server/server-core/pom.xml 2009-07-29 12:08:11 UTC (rev 5370) +++ projects/gwt-console/branches/sam/server/server-core/pom.xml 2009-07-29 12:42:15 UTC (rev 5371) @@ -29,6 +29,13 @@ <scope>provided</scope> </dependency> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>gwt-console-common</artifactId> + <version>${version}</version> + <scope>provided</scope> + </dependency> +  <dependency> <groupId>com.google.gwt</groupId> Deleted: projects/gwt-console/branches/sam/server/server-core/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java =================================================================== --- projects/gwt-console/branches/sam/server/server-core/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java 2009-07-29 12:08:11 UTC (rev 5370) +++ projects/gwt-console/branches/sam/server/server-core/src/main/java/org/jboss/bpm/console/server/gson/GsonFactory.java 2009-07-29 12:42:15 UTC (rev 5371) @@ -1,40 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.server.gson; - -import com.google.gson.Gson; -import com.google.gson.GsonBuilder; - -/** - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public class GsonFactory -{ - public static Gson createInstance() - { - Gson gson = new GsonBuilder() - .setDateFormat("yyyy-MM-dd HH:mm:ss") - .registerTypeAdapter(java.sql.Timestamp.class, new SQLDateTypeAdapter()) - .create(); - return gson; - } -} Deleted: projects/gwt-console/branches/sam/server/server-core/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java =================================================================== --- projects/gwt-console/branches/sam/server/server-core/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java 2009-07-29 12:08:11 UTC (rev 5370) +++ projects/gwt-console/branches/sam/server/server-core/src/main/java/org/jboss/bpm/console/server/gson/SQLDateTypeAdapter.java 2009-07-29 12:42:15 UTC (rev 5371) @@ -1,69 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.server.gson; - -import com.google.gson.*; - -import java.util.Date; -import java.text.*; -import java.lang.reflect.Type; - - -/** - * A default type adapter for a {@link java.util.Date} object.<br> - * Create a GSON instance that can serialize/deserialize "java.util.Date" objects: - * <pre> - * Gson gson = new GsonBuilder() - * .registerTypeAdapter(new DateTypeAdapter()) - * .create(); - * </pre> - * - * @author Joel Leitch - */ -public class SQLDateTypeAdapter implements JsonSerializer<java.sql.Timestamp>, JsonDeserializer<Date> -{ - private final DateFormat format = new SimpleDateFormat("yyyy-MM-dd HH:mm:ss"); - - public JsonElement serialize(java.sql.Timestamp src, Type typeOfSrc, JsonSerializationContext context) - { - String dateFormatAsString = format.format(src); - return new JsonPrimitive(dateFormatAsString); - } - - public Date deserialize(JsonElement json, Type typeOfT, JsonDeserializationContext context) - throws JsonParseException - { - if (!(json instanceof JsonPrimitive)) { - throw new JsonParseException("The date should be a string value"); - } - - try - { - return format.parse(json.getAsString()); - } - catch (ParseException e) - { - throw new JsonParseException(e); - } - - } -} Deleted: projects/gwt-console/branches/sam/server/server-core/src/main/java/org/jboss/bpm/console/server/util/RsComment.java =================================================================== --- projects/gwt-console/branches/sam/server/server-core/src/main/java/org/jboss/bpm/console/server/util/RsComment.java 2009-07-29 12:08:11 UTC (rev 5370) +++ projects/gwt-console/branches/sam/server/server-core/src/main/java/org/jboss/bpm/console/server/util/RsComment.java 2009-07-29 12:42:15 UTC (rev 5371) @@ -1,29 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.server.util; - -(a)java.lang.annotation.Target(value = {java.lang.annotation.ElementType.TYPE, java.lang.annotation.ElementType.METHOD}) @java.lang.annotation.Retention(value = java.lang.annotation.RetentionPolicy.RUNTIME) -public @interface RsComment { - - java.lang.String title(); - java.lang.String description(); -} \ No newline at end of file Deleted: projects/gwt-console/branches/sam/server/server-core/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java =================================================================== --- projects/gwt-console/branches/sam/server/server-core/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java 2009-07-29 12:08:11 UTC (rev 5370) +++ projects/gwt-console/branches/sam/server/server-core/src/main/java/org/jboss/bpm/console/server/util/RsDocBuilder.java 2009-07-29 12:42:15 UTC (rev 5371) @@ -1,180 +0,0 @@ -/* - * JBoss, Home of Professional Open Source. - * Copyright 2006, Red Hat Middleware LLC, and individual contributors - * as indicated by the @author tags. See the copyright.txt file in the - * distribution for a full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jboss.bpm.console.server.util; - -import org.jboss.bpm.console.server.ProcessMgmtFacade; - -import javax.ws.rs.GET; -import javax.ws.rs.Path; -import javax.ws.rs.Consumes; -import javax.ws.rs.Produces; -import java.lang.reflect.Method; -import java.util.ArrayList; -import java.util.List; -import java.util.Date; - -/** - * Creates HTML documention for JAX-RS resource classes. - * - * @author Heiko.Braun <heiko.braun(a)jboss.com> - */ -public class RsDocBuilder -{ - private String webContext; - private Class[] rootResources; - - public RsDocBuilder(String webContext, Class[] rootResources) - { - this.rootResources = rootResources; - this.webContext = webContext.startsWith("/") ? webContext : "/"+webContext; - } - - public static void main(String[] args) - { - RsDocBuilder rsDocBuilder = new RsDocBuilder( - "gwt-console-server", - new Class[] {ProcessMgmtFacade.class} - ); - - StringBuffer sb = rsDocBuilder.build(rsDocBuilder.getRootResources()[0]); - System.out.println(sb.toString()); - } - - - public String getWebContext() - { - return webContext; - } - - public Class[] getRootResources() - { - return rootResources; - } - - private StringBuffer build(Class root) - { - Path rootPath = (Path)root.getAnnotation(Path.class); - RsComment rootComment = (RsComment)root.getAnnotation(RsComment.class); - - List<Representation> representations = new ArrayList<Representation>(); - - for(Method m : root.getDeclaredMethods()) - { - Path resPath = m.getAnnotation(Path.class); - if(resPath!=null) - { - Representation r = new Representation(); - - r.path = resPath.value(); - r.httpMethod = m.getAnnotation(GET.class)!=null ? "GET" : "POST"; // currently limited to those - r.consume = (m.getAnnotation(Consumes.class)!=null) ? - arrayToString(m.getAnnotation(Consumes.class).value()) : "*/*"; - r.produce = (m.getAnnotation(Produces.class)!=null) ? - arrayToString(m.getAnnotation(Produces.class).value()) : "*/*"; - representations.add(r); - } - } - - StringBuffer sb = new StringBuffer(); - - if(rootComment!=null) - { - sb.append("<tr>"); - sb.append("<td colspan=5 style='border-bottom:1px solid black;'>"); - sb.append("<b>").append(rootComment.title()).append("</b>").append("<br>"); - sb.append("<i>").append(rootComment.description()).append("</i>"); - sb.append("</td>"); - sb.append("</tr>"); - } - - for(Representation r : representations) - { - sb.append("<tr>"); - sb.append("<td>").append(r.httpMethod.toUpperCase()).append("</td>"); - sb.append("<td>").append(buildPath(rootPath.value(),r.path)).append("</td>"); - sb.append("<td>").append("").append("</td>"); // description - sb.append("<td>").append(r.consume).append("</td>"); - sb.append("<td>").append(r.produce).append("</td>"); - sb.append("</tr>"); - } - - sb.append("<tr><td colspan=5> </td></tr>"); - - return sb; - } - - private String arrayToString(String[] arr) - { - StringBuffer sb = new StringBuffer(); - for(int i=0; i<arr.length; i++) - { - sb.append(arr[i]); - if(i<arr.length-1) - sb.append(","); - } - return sb.toString(); - } - - private String buildPath(String root, String resourcePath) - { - StringBuffer sb = new StringBuffer(); - sb.append(webContext); - sb.append("/").append(root).append("/"); - sb.append(resourcePath); - return sb.toString(); - } - - public StringBuffer build() - { - StringBuffer sb = new StringBuffer(); - sb.append("<html>").append("<body style='font-family: sans-serif; font-size:10pt;'>"); - sb.append(""); - sb.append("<table style='margin-top:10px;' width='100%'>"); - - sb.append("<tr>"); - sb.append("<th>").append("Method").append("</th>"); - sb.append("<th>").append("Path").append("</th>"); - sb.append("<th>").append("Description").append("</th>"); // description - sb.append("<th>").append("Consumes").append("</th>"); - sb.append("<th>").append("Produces").append("</th>"); - sb.append("</tr>"); - - for(Class c : rootResources) - { - sb.append( - build(c).toString() - ); - } - sb.append("</table>"); - sb.append("</body>").append("<html>"); - return sb; - - } - - private class Representation - { - String description,title = ""; - String consume,produce = ""; - String path; - String httpMethod; - } -}

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r5370 - in projects/gwt-console/branches/sam: gui/war and 10 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-07-29 08:08:11 -0400 (Wed, 29 Jul 2009) New Revision: 5370 Added: projects/gwt-console/branches/sam/sam/server/src/main/java/org/ projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/ projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/ projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/ projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/ projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/ConsoleServerApplication.java Modified: projects/gwt-console/branches/sam/gui/war/gui-war.iml projects/gwt-console/branches/sam/gui/workspace-api/workspace-api.iml projects/gwt-console/branches/sam/gwt-parent.iml projects/gwt-console/branches/sam/sam/sam-toplevel.iml projects/gwt-console/branches/sam/sam/server/sam-server.iml projects/gwt-console/branches/sam/server/server-core/server-core.iml Log: Bare bone sam server Modified: projects/gwt-console/branches/sam/gui/war/gui-war.iml =================================================================== --- projects/gwt-console/branches/sam/gui/war/gui-war.iml 2009-07-29 12:02:47 UTC (rev 5369) +++ projects/gwt-console/branches/sam/gui/war/gui-war.iml 2009-07-29 12:08:11 UTC (rev 5370) @@ -12,7 +12,6 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="gwt-rpc" exported="" /> - <orderEntry type="module" module-name="workspace-api" /> <orderEntry type="module" module-name="profiles" /> <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module-library" exported=""> Modified: projects/gwt-console/branches/sam/gui/workspace-api/workspace-api.iml =================================================================== --- projects/gwt-console/branches/sam/gui/workspace-api/workspace-api.iml 2009-07-29 12:02:47 UTC (rev 5369) +++ projects/gwt-console/branches/sam/gui/workspace-api/workspace-api.iml 2009-07-29 12:08:11 UTC (rev 5370) @@ -9,7 +9,7 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-parent" exported="" /> + <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile"> <CLASSES> Modified: projects/gwt-console/branches/sam/gwt-parent.iml =================================================================== --- projects/gwt-console/branches/sam/gwt-parent.iml 2009-07-29 12:02:47 UTC (rev 5369) +++ projects/gwt-console/branches/sam/gwt-parent.iml 2009-07-29 12:08:11 UTC (rev 5370) @@ -17,11 +17,19 @@ <sourceFolder url="file://$MODULE_DIR$/gui/workspace-example/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/gui/workspace-example/src/main/resources" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/rpc/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/sam/gui/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/sam/gui/src/main/resources" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/sam/profile/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/sam/profile/src/main/resources" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/sam/server/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/sam/server/src/main/resources" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/server/server-core/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/server/server-core/src/main/resources" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/server/server-core/src/test/java" isTestSource="true" /> <sourceFolder url="file://$MODULE_DIR$/server/server-integration/src/main/java" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="workspace-api" exported="" /> <orderEntry type="module" module-name="profiles" exported="" /> <orderEntry type="module-library" exported=""> <library name="M2 Dep: junit:junit:jar:3.8.1:test"> @@ -236,6 +244,372 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.7.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.7.GA/jboss-common-core-2.2.7.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: rhino:js:jar:1.6R2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.bpm:report-core:jar:1.0.0-SNAPSHOT:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/bpm/report-core/1.0.0-SNAPSHOT/report-core-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.w3c:flute:jar:1.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.8.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.9/gwt-mosaic-dnd-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.xml:jaxb-impl:jar:2.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/xml/jaxb-impl/2.1/jaxb-impl-2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-io:commons-io:jar:1.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.9/gwt-mosaic-gwtx-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-cli:commons-cli:jar:1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.w3c:sac:jar:1.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.jboss.bpm:gwt-console-rpc:jar:1.0.0-SNAPSHOT:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/bpm/gwt-console-rpc/1.0.0-SNAPSHOT/gwt-console-rpc-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/jboss/bpm/gwt-console-rpc/1.0.0-SNAPSHOT/gwt-console-rpc-1.0.0-SNAPSHOT-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.9/gwt-mosaic-incubator-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.9:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.9/gwt-mosaic-0.1.9.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library" exported=""> + <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module> Modified: projects/gwt-console/branches/sam/sam/sam-toplevel.iml =================================================================== --- projects/gwt-console/branches/sam/sam/sam-toplevel.iml 2009-07-29 12:02:47 UTC (rev 5369) +++ projects/gwt-console/branches/sam/sam/sam-toplevel.iml 2009-07-29 12:08:11 UTC (rev 5370) @@ -4,13 +4,16 @@ <component name="NewModuleRootManager" inherit-compiler-output="true"> <exclude-output /> <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/gui/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/gui/src/main/resources" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/profile/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/profile/src/main/resources" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/server/src/main/java" isTestSource="false" /> <sourceFolder url="file://$MODULE_DIR$/server/src/main/resources" isTestSource="false" /> </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="gwt-parent" /> - <orderEntry type="module" module-name="workspace-api" /> <orderEntry type="module-library"> <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> <CLASSES> @@ -102,15 +105,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" /> @@ -196,24 +190,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" /> @@ -223,15 +199,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.7.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.7.GA/jboss-common-core-2.2.7.GA.jar!/" /> @@ -241,15 +208,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" /> @@ -259,17 +217,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" /> @@ -288,15 +235,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" /> @@ -306,42 +244,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: rhino:js:jar:1.6R2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss.bpm:report-core:jar:1.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/bpm/report-core/1.0.0-SNAPSHOT/report-core-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.w3c:flute:jar:1.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> @@ -362,15 +264,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.8.1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: junit:junit:jar:3.8.1:test"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> @@ -389,24 +282,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: javax.xml:jaxb-impl:jar:2.1:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/jaxb-impl/2.1/jaxb-impl-2.1.jar!/" /> @@ -416,15 +291,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" /> @@ -452,42 +318,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: commons-cli:commons-cli:jar:1.0:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.w3c:sac:jar:1.3:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" /> @@ -497,27 +327,27 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile"> + <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test"> + <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile"> + <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided"> <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" /> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> </CLASSES> <JAVADOC /> <SOURCES /> Modified: projects/gwt-console/branches/sam/sam/server/sam-server.iml =================================================================== --- projects/gwt-console/branches/sam/sam/server/sam-server.iml 2009-07-29 12:02:47 UTC (rev 5369) +++ projects/gwt-console/branches/sam/sam/server/sam-server.iml 2009-07-29 12:08:11 UTC (rev 5370) @@ -9,7 +9,6 @@ </content> <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> - <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="module-library"> <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile"> <CLASSES> @@ -65,24 +64,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> @@ -110,15 +91,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:test"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" /> @@ -166,33 +138,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" /> @@ -202,24 +147,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: commons-cli:commons-cli:jar:1.0:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: javax.activation:activation:jar:1.1:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> @@ -240,15 +167,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" /> @@ -258,26 +176,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" /> - </SOURCES> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:test"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" /> @@ -287,15 +185,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.w3c:sac:jar:1.3:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" /> @@ -323,24 +212,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: rhino:js:jar:1.6R2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" /> @@ -350,33 +221,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.jboss.bpm:report-core:jar:1.0.0-SNAPSHOT:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/bpm/report-core/1.0.0-SNAPSHOT/report-core-1.0.0-SNAPSHOT.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> - <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" /> @@ -386,15 +230,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: org.w3c:flute:jar:1.2:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> @@ -415,15 +250,6 @@ </library> </orderEntry> <orderEntry type="module-library"> - <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.8.1:compile"> - <CLASSES> - <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" /> - </CLASSES> - <JAVADOC /> - <SOURCES /> - </library> - </orderEntry> - <orderEntry type="module-library"> <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile"> <CLASSES> <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" /> Added: projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/ConsoleServerApplication.java =================================================================== --- projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/ConsoleServerApplication.java (rev 0) +++ projects/gwt-console/branches/sam/sam/server/src/main/java/org/jboss/sam/console/server/ConsoleServerApplication.java 2009-07-29 12:08:11 UTC (rev 5370) @@ -0,0 +1,55 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.sam.console.server; + +import javax.ws.rs.core.Application; +import java.util.HashSet; +import java.util.Set; + +/** + * JAX-RS core component. + * + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class ConsoleServerApplication extends Application +{ + HashSet<Object> singletons = new HashSet<Object>(); + + public ConsoleServerApplication() + { + + } + + @Override + public Set<Class<?>> getClasses() + { + HashSet<Class<?>> set = new HashSet<Class<?>>(); + return set; + } + + @Override + public Set<Object> getSingletons() + { + return singletons; + } +} + Modified: projects/gwt-console/branches/sam/server/server-core/server-core.iml =================================================================== --- projects/gwt-console/branches/sam/server/server-core/server-core.iml 2009-07-29 12:02:47 UTC (rev 5369) +++ projects/gwt-console/branches/sam/server/server-core/server-core.iml 2009-07-29 12:08:11 UTC (rev 5370) @@ -13,9 +13,9 @@ <orderEntry type="inheritedJdk" /> <orderEntry type="sourceFolder" forTests="false" /> <orderEntry type="module" module-name="gwt-rpc" exported="" /> - <orderEntry type="module" module-name="gwt-parent" exported="" /> <orderEntry type="module" module-name="server-integration" exported="" /> <orderEntry type="module" module-name="report-server" exported="" /> + <orderEntry type="module" module-name="gwt-parent" /> <orderEntry type="library" name="jaxb-impl-2.1" level="application" /> <orderEntry type="module-library"> <library> @@ -26,6 +26,428 @@ <SOURCES /> </library> </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: junit:junit:jar:3.8.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.xml:jaxb-impl:jar:2.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/jaxb-impl/2.1/jaxb-impl-2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-io:commons-io:jar:1.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-cli:commons-cli:jar:1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.activation:activation:jar:1.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.7.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.7.GA/jboss-common-core-2.2.7.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.w3c:sac:jar:1.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: rhino:js:jar:1.6R2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.bpm:report-core:jar:1.0.0-SNAPSHOT:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/bpm/report-core/1.0.0-SNAPSHOT/report-core-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.w3c:flute:jar:1.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.8.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> <orderEntryProperties /> </component> </module>

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r5369 - in projects/gwt-console/branches/sam: gui/war and 25 other directories.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-07-29 08:02:47 -0400 (Wed, 29 Jul 2009) New Revision: 5369 Added: projects/gwt-console/branches/sam/sam/ projects/gwt-console/branches/sam/sam/gui/ projects/gwt-console/branches/sam/sam/gui/pom.xml projects/gwt-console/branches/sam/sam/gui/src/ projects/gwt-console/branches/sam/sam/gui/src/main/ projects/gwt-console/branches/sam/sam/gui/src/main/java/ projects/gwt-console/branches/sam/sam/gui/src/main/resources/ projects/gwt-console/branches/sam/sam/pom.xml projects/gwt-console/branches/sam/sam/profile/ projects/gwt-console/branches/sam/sam/profile/pom.xml projects/gwt-console/branches/sam/sam/profile/sam-profile.iml projects/gwt-console/branches/sam/sam/profile/src/ projects/gwt-console/branches/sam/sam/profile/src/main/ projects/gwt-console/branches/sam/sam/profile/src/main/java/ projects/gwt-console/branches/sam/sam/profile/src/main/java/org/ projects/gwt-console/branches/sam/sam/profile/src/main/java/org/jboss/ projects/gwt-console/branches/sam/sam/profile/src/main/java/org/jboss/sam/ projects/gwt-console/branches/sam/sam/profile/src/main/java/org/jboss/sam/console/ projects/gwt-console/branches/sam/sam/profile/src/main/java/org/jboss/sam/console/SAMEditor.java projects/gwt-console/branches/sam/sam/profile/src/main/resources/ projects/gwt-console/branches/sam/sam/profile/src/main/resources/jmaki/ projects/gwt-console/branches/sam/sam/profile/src/main/resources/jmaki/xhp/ projects/gwt-console/branches/sam/sam/profile/src/main/resources/jmaki/xhp/xhp.json projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/ projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/ projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/ projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/ projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/public/ projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/public/console.config.js projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/public/images/ projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/public/sam-logo.png projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/workspace.cfg projects/gwt-console/branches/sam/sam/sam-toplevel.iml projects/gwt-console/branches/sam/sam/server/ projects/gwt-console/branches/sam/sam/server/pom.xml projects/gwt-console/branches/sam/sam/server/sam-server.iml projects/gwt-console/branches/sam/sam/server/src/ projects/gwt-console/branches/sam/sam/server/src/main/ projects/gwt-console/branches/sam/sam/server/src/main/java/ projects/gwt-console/branches/sam/sam/server/src/main/resources/ projects/gwt-console/branches/sam/sam/server/src/main/webapp/ projects/gwt-console/branches/sam/sam/server/src/main/webapp/WEB-INF/ projects/gwt-console/branches/sam/sam/server/src/main/webapp/WEB-INF/jboss-web.xml projects/gwt-console/branches/sam/sam/server/src/main/webapp/WEB-INF/web.xml Modified: projects/gwt-console/branches/sam/gui/war/pom.xml projects/gwt-console/branches/sam/pom.xml Log: Start work on SAM console Modified: projects/gwt-console/branches/sam/gui/war/pom.xml =================================================================== --- projects/gwt-console/branches/sam/gui/war/pom.xml 2009-07-29 11:41:18 UTC (rev 5368) +++ projects/gwt-console/branches/sam/gui/war/pom.xml 2009-07-29 12:02:47 UTC (rev 5369) @@ -350,6 +350,57 @@ </profile> <profile> + <id>sam-console.profile</id> + <activation> + <property> + <name>console.profile</name> + <value>sam</value> + </property> + </activation> + <dependencies> + <dependency> + <groupId>org.jboss.sam</groupId> + <artifactId>gwt-console-profile-sam</artifactId> + <version>${version}</version> + </dependency> + </dependencies> + <properties> + <console.app.webcontext>gwt-console</console.app.webcontext> + </properties> + <build> + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-dependency-plugin</artifactId> + <executions> + + <execution> + <id>unpack-profile-drools</id> + <phase>process-resources</phase> + <goals> + <goal>unpack</goal> + </goals> + <configuration> + <artifactItems> + <artifactItem> + <groupId>org.jboss.bpm</groupId> + <artifactId>gwt-console-profile-sam</artifactId> + <version>${version}</version> + <type>jar</type> + <overWrite>true</overWrite> + <outputDirectory>target/classes</outputDirectory> + </artifactItem> + </artifactItems> + </configuration> + </execution> + + </executions> + </plugin> + </plugins> + </build> + </profile> + + <profile> <id>gwt-dev-windows</id> <properties> <platform>windows</platform> Modified: projects/gwt-console/branches/sam/pom.xml =================================================================== --- projects/gwt-console/branches/sam/pom.xml 2009-07-29 11:41:18 UTC (rev 5368) +++ projects/gwt-console/branches/sam/pom.xml 2009-07-29 12:02:47 UTC (rev 5369) @@ -41,6 +41,7 @@ <module>rpc</module> <module>server</module> <module>gui</module> + <module>sam</module> </modules> <dependencyManagement> Added: projects/gwt-console/branches/sam/sam/gui/pom.xml =================================================================== --- projects/gwt-console/branches/sam/sam/gui/pom.xml (rev 0) +++ projects/gwt-console/branches/sam/sam/gui/pom.xml 2009-07-29 12:02:47 UTC (rev 5369) @@ -0,0 +1,27 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <name>JBoss BPM - SAM Console (GUI SAM)</name> + <groupId>org.jboss.sam</groupId> + <artifactId>sam-gui</artifactId> + <packaging>jar</packaging> + +  + <parent> + <groupId>org.jboss.sam</groupId> + <artifactId>sam-console-extension</artifactId> + <version>1.0.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <dependencies> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>gwt-console-workspace-api</artifactId> + <version>${version}</version> + </dependency> + </dependencies> + +</project> Added: projects/gwt-console/branches/sam/sam/pom.xml =================================================================== --- projects/gwt-console/branches/sam/sam/pom.xml (rev 0) +++ projects/gwt-console/branches/sam/sam/pom.xml 2009-07-29 12:02:47 UTC (rev 5369) @@ -0,0 +1,24 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <name>JBoss BPM - SAM Console (SAM)</name> + <groupId>org.jboss.sam</groupId> + <artifactId>sam-console-extension</artifactId> + <packaging>pom</packaging> + +  + <parent> + <groupId>org.jboss.bpm</groupId> + <artifactId>gwt-console-parent</artifactId> + <version>1.0.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <modules> + <module>server</module> + <module>profile</module> + <module>gui</module> + </modules> +</project> Added: projects/gwt-console/branches/sam/sam/profile/pom.xml =================================================================== --- projects/gwt-console/branches/sam/sam/profile/pom.xml (rev 0) +++ projects/gwt-console/branches/sam/sam/profile/pom.xml 2009-07-29 12:02:47 UTC (rev 5369) @@ -0,0 +1,27 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <name>JBoss BPM - SAM Console (GUI Profile SAM)</name> + <groupId>org.jboss.sam</groupId> + <artifactId>gwt-console-profile-sam</artifactId> + <packaging>jar</packaging> + +  + <parent> + <groupId>org.jboss.sam</groupId> + <artifactId>sam-console-extension</artifactId> + <version>1.0.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + + <dependencies> + <dependency> + <groupId>org.jboss.bpm</groupId> + <artifactId>gwt-console-workspace-api</artifactId> + <version>${version}</version> + </dependency> + </dependencies> + +</project> Added: projects/gwt-console/branches/sam/sam/profile/sam-profile.iml =================================================================== --- projects/gwt-console/branches/sam/sam/profile/sam-profile.iml (rev 0) +++ projects/gwt-console/branches/sam/sam/profile/sam-profile.iml 2009-07-29 12:02:47 UTC (rev 5369) @@ -0,0 +1,183 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="gwt-parent" /> + <orderEntry type="module" module-name="workspace-api" /> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.10:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-digester:commons-digester:jar:1.8:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.10:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.10/gwt-mosaic-dnd-0.1.10.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.10:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.10/gwt-mosaic-gwtx-0.1.10.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-configuration:commons-configuration:jar:1.6:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.8.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.10:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.10/gwt-mosaic-incubator-0.1.10.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.activation:activation:jar:1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> +</module> + Added: projects/gwt-console/branches/sam/sam/profile/src/main/java/org/jboss/sam/console/SAMEditor.java =================================================================== --- projects/gwt-console/branches/sam/sam/profile/src/main/java/org/jboss/sam/console/SAMEditor.java (rev 0) +++ projects/gwt-console/branches/sam/sam/profile/src/main/java/org/jboss/sam/console/SAMEditor.java 2009-07-29 12:02:47 UTC (rev 5369) @@ -0,0 +1,65 @@ +/* + * JBoss, Home of Professional Open Source. + * Copyright 2006, Red Hat Middleware LLC, and individual contributors + * as indicated by the @author tags. See the copyright.txt file in the + * distribution for a full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jboss.sam.console; + +import org.jboss.bpm.console.client.Editor; +import org.jboss.bpm.console.client.MenuSection; +import org.jboss.bpm.console.client.ApplicationContext; + +/** + * @author Heiko.Braun <heiko.braun(a)jboss.com> + */ +public class SAMEditor extends Editor +{ + public final static String ID = SAMEditor.class.getName(); + + private boolean initialized; + + public SAMEditor(ApplicationContext appContext) + { + super(appContext); + } + + public void initialize() + { + if(!initialized) + { + + initialized = true; + } + } + + public String getEditorId() + { + return ID; + } + + public String getTitle() + { + return "Overview"; + } + + public MenuSection provideMenuSection() + { + return null; + } +} Added: projects/gwt-console/branches/sam/sam/profile/src/main/resources/jmaki/xhp/xhp.json =================================================================== --- projects/gwt-console/branches/sam/sam/profile/src/main/resources/jmaki/xhp/xhp.json (rev 0) +++ projects/gwt-console/branches/sam/sam/profile/src/main/resources/jmaki/xhp/xhp.json 2009-07-29 12:02:47 UTC (rev 5369) @@ -0,0 +1,12 @@ +{"xhp": { + "version": "1.1", + "services": [ + {"id": "default", + "url":"http://localhost:8080/activity-monitor", + "passthrough":true, + "username":"sam", + "password":"password" + }, + ] + } +} \ No newline at end of file Added: projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/public/console.config.js =================================================================== --- projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/public/console.config.js (rev 0) +++ projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/public/console.config.js 2009-07-29 12:02:47 UTC (rev 5369) @@ -0,0 +1,8 @@ +var consoleConfig = { + profileName: "SAM Console", + logo: "sam-logo.png", + serverWebContext: "/activity-monitor", + overallReportFile: "", + processSummaryReportFile: "", + instanceSummaryReportFile: "" +}; \ No newline at end of file Added: projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/public/sam-logo.png =================================================================== (Binary files differ) Property changes on: projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/public/sam-logo.png ___________________________________________________________________ Name: svn:executable + * Name: svn:mime-type + application/octet-stream Added: projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/workspace.cfg =================================================================== --- projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/workspace.cfg (rev 0) +++ projects/gwt-console/branches/sam/sam/profile/src/main/resources/org/jboss/bpm/console/workspace.cfg 2009-07-29 12:02:47 UTC (rev 5369) @@ -0,0 +1 @@ +org.jboss.bpm.console.client.SettingsEditor \ No newline at end of file Added: projects/gwt-console/branches/sam/sam/sam-toplevel.iml =================================================================== --- projects/gwt-console/branches/sam/sam/sam-toplevel.iml (rev 0) +++ projects/gwt-console/branches/sam/sam/sam-toplevel.iml 2009-07-29 12:02:47 UTC (rev 5369) @@ -0,0 +1,529 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/server/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/server/src/main/resources" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="gwt-parent" /> + <orderEntry type="module" module-name="workspace-api" /> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-collections:commons-collections:jar:3.2.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic:jar:0.1.10:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic/0.1.10/gwt-mosaic-0.1.10.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-digester:commons-digester:jar:1.8:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-digester/commons-digester/1.8/commons-digester-1.8.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.googlecode.mvc4g:mvc4g:jar:1.0.0-jboss:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/mvc4g/mvc4g/1.0.0-jboss/mvc4g-1.0.0-jboss.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-dnd:jar:0.1.10:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-dnd/0.1.10/gwt-mosaic-dnd-0.1.10.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-gwtx:jar:0.1.10:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-gwtx/0.1.10/gwt-mosaic-gwtx-0.1.10.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-configuration:commons-configuration:jar:1.6:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-configuration/commons-configuration/1.6/commons-configuration-1.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-beanutils:commons-beanutils-core:jar:1.8.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-beanutils/commons-beanutils-core/1.8.0/commons-beanutils-core-1.8.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.googlecode.gwtmosaic:gwt-mosaic-incubator:jar:0.1.10:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/googlecode/gwtmosaic/gwt-mosaic-incubator/0.1.10/gwt-mosaic-incubator-0.1.10.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.activation:activation:jar:1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.code.gwt-log:gwt-log:jar:2.5.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/code/gwt-log/gwt-log/2.5.2/gwt-log-2.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.7.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.7.GA/jboss-common-core-2.2.7.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: rhino:js:jar:1.6R2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.bpm:report-core:jar:1.0.0-SNAPSHOT:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/bpm/report-core/1.0.0-SNAPSHOT/report-core-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.w3c:flute:jar:1.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.8.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: junit:junit:jar:3.8.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.xml:jaxb-impl:jar:2.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/xml/jaxb-impl/2.1/jaxb-impl-2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-io:commons-io:jar:1.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-cli:commons-cli:jar:1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.w3c:sac:jar:1.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> +</module> + Added: projects/gwt-console/branches/sam/sam/server/pom.xml =================================================================== --- projects/gwt-console/branches/sam/sam/server/pom.xml (rev 0) +++ projects/gwt-console/branches/sam/sam/server/pom.xml 2009-07-29 12:02:47 UTC (rev 5369) @@ -0,0 +1,190 @@ +<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd"> + + <modelVersion>4.0.0</modelVersion> + <name>JBoss BPM - SAM Console (SAM Server)</name> + <groupId>org.jboss.sam</groupId> + <artifactId>sam-server</artifactId> + <packaging>war</packaging> + +  + <parent> + <groupId>org.jboss.sam</groupId> + <artifactId>sam-console-extension</artifactId> + <version>1.0.1-SNAPSHOT</version> + <relativePath>../pom.xml</relativePath> + </parent> + +  + <properties> + <report.server.version>1.0.0-SNAPSHOT</report.server.version> + <json-lib.version>2.2.3</json-lib.version> + </properties> + + <dependencies> +  + +  + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-servlet</artifactId> + <scope>runtime</scope> + </dependency> + <dependency> + <groupId>com.google.gwt</groupId> + <artifactId>gwt-user</artifactId> + <scope>provided</scope> + </dependency> + +  + <dependency> + <groupId>commons-logging</groupId> + <artifactId>commons-logging</artifactId> + </dependency> + + <dependency> + <groupId>javax.ejb</groupId> + <artifactId>ejb-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-jaxrs</artifactId> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + <exclusion> + <groupId>tjws</groupId> + <artifactId>webserver</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>org.jboss.resteasy</groupId> + <artifactId>resteasy-multipart-provider</artifactId> + <exclusions> + <exclusion> + <groupId>javax.servlet</groupId> + <artifactId>servlet-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.activation</groupId> + <artifactId>activation</artifactId> + </exclusion> + <exclusion> + <groupId>commons-httpclient</groupId> + <artifactId>commons-httpclient</artifactId> + </exclusion> + <exclusion> + <groupId>javax.mail</groupId> + <artifactId>mail</artifactId> + </exclusion> + <exclusion> + <groupId>tjws</groupId> + <artifactId>webserver</artifactId> + </exclusion> + <exclusion> + <groupId>com.sun.xml.bind</groupId> + <artifactId>jaxb-impl</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.bind</groupId> + <artifactId>jaxb-api</artifactId> + </exclusion> + <exclusion> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + </exclusion> + </exclusions> + </dependency> + <dependency> + <groupId>com.google.code.gson</groupId> + <artifactId>gson</artifactId> + </dependency> + <dependency> + <groupId>net.sf.json-lib</groupId> + <artifactId>json-lib</artifactId> + <version>${json-lib.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>junit</groupId> + <artifactId>junit</artifactId> + <version>${junit.version}</version> + <scope>test</scope> + </dependency> + <dependency> + <groupId>commons-fileupload</groupId> + <artifactId>commons-fileupload</artifactId> + </dependency> + <dependency> + <groupId>commons-io</groupId> + <artifactId>commons-io</artifactId> + </dependency> + <dependency> + <groupId>org.jboss</groupId> + <artifactId>jboss-common-core</artifactId> + <scope>provided</scope> + </dependency> + <dependency> + <groupId>javax.xml</groupId> + <artifactId>jaxb-impl</artifactId> + <scope>provided</scope> + </dependency> + </dependencies> + + <build> +  + <resources> + <resource> + <directory>src/main/java</directory> + </resource> + <resource> + <directory>src/main/resources</directory> + </resource> + </resources> + + <plugins> + <plugin> + <groupId>org.apache.maven.plugins</groupId> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> + <source>1.5</source> + <target>1.5</target> + </configuration> + </plugin> + + </plugins> + <finalName>sam-server</finalName> + </build> +</project> Added: projects/gwt-console/branches/sam/sam/server/sam-server.iml =================================================================== --- projects/gwt-console/branches/sam/sam/server/sam-server.iml (rev 0) +++ projects/gwt-console/branches/sam/sam/server/sam-server.iml 2009-07-29 12:02:47 UTC (rev 5369) @@ -0,0 +1,438 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module version="4" relativePaths="true" type="JAVA_MODULE"> + <component name="ModuleRootManager" /> + <component name="NewModuleRootManager" inherit-compiler-output="true"> + <exclude-output /> + <content url="file://$MODULE_DIR$"> + <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" /> + <sourceFolder url="file://$MODULE_DIR$/src/main/resources" isTestSource="false" /> + </content> + <orderEntry type="inheritedJdk" /> + <orderEntry type="sourceFolder" forTests="false" /> + <orderEntry type="module" module-name="gwt-parent" /> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-logging:commons-logging:jar:1.1.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.code.gson:gson:jar:1.2.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.xml.bind:jaxb-api:jar:2.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/bind/jaxb-api/2.1/jaxb-api-2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: junit:junit:jar:3.8.1:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: net.sf.json-lib:json-lib:jar:2.2.3:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/net/sf/json-lib/json-lib/2.2.3/json-lib-2.2.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:modelapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-discovery:commons-discovery:jar:0.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.xml.stream:stax-api:jar:1.0-2:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/stream/stax-api/1.0-2/stax-api-1.0-2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.gwt:gwt-user:jar:1.5.3:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/gwt/gwt-user/1.5.3/gwt-user-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.xml:jaxb-impl:jar:2.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/xml/jaxb-impl/2.1/jaxb-impl-2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:dataadapterapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-beanutils:commons-beanutils:jar:1.7.0:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-beanutils/commons-beanutils/1.7.0/commons-beanutils-1.7.0-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-fileupload:commons-fileupload:jar:1.2.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-fileupload/commons-fileupload/1.2.1/commons-fileupload-1.2.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-io:commons-io:jar:1.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-io/commons-io/1.3.2/commons-io-1.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:chartengineapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.emf:common:jar:2.4.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.emf:ecore-xmi:jar:2.4.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.resteasy:resteasy-multipart-provider:jar:1.0.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/resteasy-multipart-provider/1.0.2.GA/resteasy-multipart-provider-1.0.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-cli:commons-cli:jar:1.0:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:scriptapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.activation:activation:jar:1.1:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/activation/activation/1.1/activation-1.1-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss:jboss-common-core:jar:2.2.7.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/jboss-common-core/2.2.7.GA/jboss-common-core-2.2.7.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:engineapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: net.sf.ezmorph:ezmorph:jar:1.0.6:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/net/sf/ezmorph/ezmorph/1.0.6/ezmorph-1.0.6.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:dteapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-codec:commons-codec:jar:1.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-lang:commons-lang:jar:2.4:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-lang/commons-lang/2.4/commons-lang-2.4.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.w3c:sac:jar:1.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javax.ejb:ejb-api:jar:3.0:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javax/ejb/ejb-api/3.0/ejb-api-3.0.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.google.gwt:gwt-servlet:jar:1.5.3:runtime"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/google/gwt/gwt-servlet/1.5.3/gwt-servlet-1.5.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.birt:coreapi:jar:2.3.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: rhino:js:jar:1.6R2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.lowagie:itext:jar:1.3:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.bpm:report-core:jar:1.0.0-SNAPSHOT:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/bpm/report-core/1.0.0-SNAPSHOT/report-core-1.0.0-SNAPSHOT.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.eclipse.emf:ecore:jar:2.4.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: commons-collections:commons-collections:jar:3.2:test"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/commons-collections/commons-collections/3.2/commons-collections-3.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.w3c:flute:jar:1.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.logging:jboss-logging-spi:jar:2.0.5.GA:provided"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/logging/jboss-logging-spi/2.0.5.GA/jboss-logging-spi-2.0.5.GA-sources.jar!/" /> + </SOURCES> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: com.ibm.icu:icu4j:jar:3.8.1:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntry type="module-library"> + <library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2:compile"> + <CLASSES> + <root url="jar://$MODULE_DIR$/../../../../../../../../.m2/repository/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" /> + </CLASSES> + <JAVADOC /> + <SOURCES /> + </library> + </orderEntry> + <orderEntryProperties /> + </component> +</module> + Added: projects/gwt-console/branches/sam/sam/server/src/main/webapp/WEB-INF/jboss-web.xml =================================================================== --- projects/gwt-console/branches/sam/sam/server/src/main/webapp/WEB-INF/jboss-web.xml (rev 0) +++ projects/gwt-console/branches/sam/sam/server/src/main/webapp/WEB-INF/jboss-web.xml 2009-07-29 12:02:47 UTC (rev 5369) @@ -0,0 +1,13 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<!DOCTYPE jboss-web PUBLIC + "-//JBoss//DTD Web Application 2.4//EN" + "http://www.jboss.org/j2ee/dtd/jboss-web_4_2.dtd"> + +<jboss-web> + +  + + <context-root>activity-monitor</context-root> + +</jboss-web> Added: projects/gwt-console/branches/sam/sam/server/src/main/webapp/WEB-INF/web.xml =================================================================== --- projects/gwt-console/branches/sam/sam/server/src/main/webapp/WEB-INF/web.xml (rev 0) +++ projects/gwt-console/branches/sam/sam/server/src/main/webapp/WEB-INF/web.xml 2009-07-29 12:02:47 UTC (rev 5369) @@ -0,0 +1,80 @@ +<!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>GWT Console Server</display-name> + + <context-param> + <param-name>javax.ws.rs.core.Application</param-name> + <param-value>org.jboss.sam.console.server.ConsoleServerApplication</param-value> + </context-param> + + <context-param> + <param-name>resteasy.servlet.mapping.prefix</param-name> + <param-value>/rs</param-value> + </context-param> + + <context-param> + <param-name>resteasy.providers</param-name> + <param-value>org.jboss.bpm.report.FileWriter</param-value> + </context-param> + + <filter> + <filter-name>gwtJSON</filter-name> + <filter-class>org.jboss.bpm.console.server.util.GWTJsonFilter</filter-class> + </filter> + <filter-mapping> + <filter-name>gwtJSON</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + + <listener> + <listener-class> + org.jboss.resteasy.plugins.server.servlet.ResteasyBootstrap + </listener-class> + </listener> + + <servlet> + <servlet-name>Resteasy</servlet-name> + <servlet-class> + org.jboss.resteasy.plugins.server.servlet.HttpServletDispatcher + </servlet-class> + </servlet> + + <servlet-mapping> + <servlet-name>Resteasy</servlet-name> + <url-pattern>/rs/*</url-pattern> + </servlet-mapping> + +  + +</web-app>

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r5368 - projects/gwt-console/branches.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-07-29 07:41:18 -0400 (Wed, 29 Jul 2009) New Revision: 5368 Added: projects/gwt-console/branches/sam/ Log: recreate sam branch Copied: projects/gwt-console/branches/sam (from rev 5367, projects/gwt-console/trunk)

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r5367 - projects/gwt-console/branches.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-07-29 07:40:31 -0400 (Wed, 29 Jul 2009) New Revision: 5367 Removed: projects/gwt-console/branches/sam/ Log: recreate branch

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r5366 - projects/gwt-console/branches.

by do-not-reply＠jboss.org

Author: heiko.braun(a)jboss.com Date: 2009-07-29 07:37:59 -0400 (Wed, 29 Jul 2009) New Revision: 5366 Added: projects/gwt-console/branches/sam/ Log: dev branch

15 years, 3 months

1
0
0 / 0

JBoss JBPM SVN: r5365 - in jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal: jobexecutor and 1 other directory.

by do-not-reply＠jboss.org

Author: alex.guizar(a)jboss.com Date: 2009-07-28 22:01:11 -0400 (Tue, 28 Jul 2009) New Revision: 5365 Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobParcel.java Removed: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThreadPool.java Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java Log: [JBPM-2402] verify job executor threads in case of errors replace our custom thread pool with Executors.newFixedThreadPool, which recreates terminated threads Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java 2009-07-29 01:30:33 UTC (rev 5364) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/cmd/ExecuteJobCmd.java 2009-07-29 02:01:11 UTC (rev 5365) @@ -85,7 +85,7 @@ throw new JbpmException("job took too long: lock expired "+(currentTime-lockExpiration)+"ms ago"); } } - } catch (Throwable exception) { + } catch (Exception exception) { log.error("exception while executing '"+job+"'", exception); handleJobExecutionException(environment, job, exception); } finally { @@ -102,7 +102,7 @@ * Transaction.EVENT_AFTERCOMPLETION (after the job locks of the current transaction are * released). Then the command will update the job with the exception details in a separate * transaction. */ - protected void handleJobExecutionException(Environment environment, JobImpl<?> job, Throwable exception) { + protected void handleJobExecutionException(Environment environment, JobImpl<?> job, Exception exception) { Transaction transaction = environment.get(Transaction.class); // transaction.setRollbackOnly(); Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java 2009-07-29 01:30:33 UTC (rev 5364) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/DispatcherThread.java 2009-07-29 02:01:11 UTC (rev 5365) @@ -40,7 +40,7 @@ private static final Log log = Log.getLog(DispatcherThread.class.getName()); protected JobExecutor jobExecutor; - protected boolean isActive = true; + protected volatile boolean isActive = true; protected boolean checkForNewJobs; protected int currentIdleInterval; protected Object semaphore = new Object(); @@ -55,7 +55,7 @@ } public void run() { - log.info("starting..."); + log.info("starting " + getName()); currentIdleInterval = jobExecutor.getIdleMillis(); try { while (isActive) { @@ -69,7 +69,7 @@ // no exception so resetting the currentIdleInterval currentIdleInterval = jobExecutor.getIdleMillis(); if ((acquiredJobDbids != null) && (!acquiredJobDbids.isEmpty())) { - putAcquiredJobDbidsOnQueue(acquiredJobDbids); + submitAcquiredJobDbids(acquiredJobDbids); log.debug("added jobs "+acquiredJobDbids+" to the queue"); } else if (isActive) { @@ -88,7 +88,7 @@ } } catch (InterruptedException e) { - log.info((isActive ? "active" : "inactivated") + " job dispatcher thread '" + getName() + "' got interrupted"); + log.info((isActive ? "active" : "inactive") + " job dispatcher thread '" + getName() + "' got interrupted"); } catch (Exception e) { log.error("exception in job executor thread. waiting " + currentIdleInterval + " milliseconds", e); try { @@ -103,24 +103,16 @@ currentIdleInterval = currentIdleInterval * 2; } } - } catch (Throwable t) { - t.printStackTrace(); } finally { log.info(getName() + " leaves cyberspace"); } } - protected void putAcquiredJobDbidsOnQueue(Collection<Long> acquiredJobDbids) { - log.debug("pushing jobs on the queue "+acquiredJobDbids); - while (acquiredJobDbids!=null) { - try { - jobExecutor.getJobDbidsQueue().put(acquiredJobDbids); - log.trace("jobs "+acquiredJobDbids+" were put on the queue"); - acquiredJobDbids = null; - } catch (InterruptedException e) { - log.trace("putting acquired job dbids got interrupted. retrying..."); - } - } + protected void submitAcquiredJobDbids(Collection<Long> jobDbids) { + log.debug("submitting jobs "+jobDbids); + jobExecutor.getThreadPool().submit( + new JobParcel(jobExecutor.getCommandExecutor(), jobDbids)); + log.trace("jobs "+jobDbids+" were submitted"); } protected Collection<Long> acquireJobs() { @@ -161,13 +153,11 @@ isActive = false; interrupt(); if (join) { - while (isAlive()) { - try { - log.debug("joining "+getName()); - join(); - } catch (InterruptedException e) { - log.trace("joining "+getName()+" got interrupted"); - } + try { + log.debug("joining "+getName()); + join(); + } catch (InterruptedException e) { + log.trace("joining "+getName()+" got interrupted"); } } } else { Modified: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java 2009-07-29 01:30:33 UTC (rev 5364) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutor.java 2009-07-29 02:01:11 UTC (rev 5365) @@ -23,12 +23,14 @@ import java.io.Serializable; import java.net.InetAddress; +import java.net.UnknownHostException; import java.util.ArrayList; import java.util.Collection; import java.util.Date; import java.util.List; -import java.util.concurrent.ArrayBlockingQueue; -import java.util.concurrent.BlockingQueue; +import java.util.concurrent.ExecutorService; +import java.util.concurrent.Executors; +import java.util.concurrent.TimeUnit; import org.jbpm.api.JbpmException; import org.jbpm.internal.log.Log; @@ -41,6 +43,7 @@ * @author Tom Baeyens, Guillaume Porcher */ public class JobExecutor implements Serializable { + private static final Log log = Log.getLog(JobExecutor.class.getName()); private static final long serialVersionUID = 1L; @@ -60,16 +63,11 @@ Command<Collection<Long>> acquireJobsCommand; Command<Date> nextDueDateCommand; - boolean isActive = false; + boolean isActive; - JobExecutorThreadPool jobExecutorThreadPool; + ExecutorService threadPool; + DispatcherThread dispatcherThread; - DispatcherThread dispatcherThread = null; - - /** queue to dispatch collections of jobDbids to the JobExecutorThreads, which are - * competing readers. */ - BlockingQueue<Collection<Long>> jobDbidsQueue = null; - List<JobHistoryEntry> history = new ArrayList<JobHistoryEntry>(); /** starts the {@link DispatcherThread} and {@link JobExecutorThread}s for this job executor */ @@ -81,14 +79,9 @@ acquireJobsCommand = new AcquireJobsCmd(this); nextDueDateCommand = new GetNextDueDateCmd(this); - // the max capacity of the jobDbidsQueue is set to nbrOfJobExecutorThreads. - // That way, the distpatcher thread will be stalled if enough jobs are acquired. - jobDbidsQueue = new ArrayBlockingQueue<Collection<Long>>(nbrOfThreads, true); - isActive = true; - log.trace("starting job executor threads for job executor '"+name+"'..."); - jobExecutorThreadPool = new JobExecutorThreadPool(this); - jobExecutorThreadPool.start(); + log.trace("starting thread pool for job executor '"+name+"'..."); + threadPool = Executors.newFixedThreadPool(nbrOfThreads); log.trace("starting dispatcher thread for job executor '"+name+"'..."); dispatcherThread = new DispatcherThread(this); @@ -117,24 +110,19 @@ if (isActive) { isActive = false; dispatcherThread.deactivate(true); - waitTillQueueEmpty(); - jobExecutorThreadPool.deactivate(join); + threadPool.shutdown(); + if (join) { + try { + threadPool.awaitTermination(Long.MAX_VALUE, TimeUnit.MILLISECONDS); + } catch (InterruptedException e) { + log.trace("joining "+getName()+" got interrupted"); + } + } } else { log.trace("ignoring stop: job executor '"+name+"' not started"); } } - protected void waitTillQueueEmpty() { - while (! jobDbidsQueue.isEmpty()) { - log.trace("waiting for job-id-queue to become empty"); - try { - Thread.sleep(200); - } catch (InterruptedException e) { - log.trace("waiting for job-id-queue to become empty got interrupted"); - } - } - } - public void jobWasAdded() { if ( (dispatcherThread!=null) && (dispatcherThread.isActive()) @@ -143,16 +131,16 @@ } } - protected static String getHostName() { + static String getHostName() { try { return InetAddress.getLocalHost().getHostAddress(); - } catch (Exception e) { - return "unknown"; + } catch (UnknownHostException e) { + return "localhost"; } } - protected BlockingQueue<Collection<Long>> getJobDbidsQueue() { - return jobDbidsQueue; + protected ExecutorService getThreadPool() { + return threadPool; } // getters ////////////////////////////////////////////////////////////////// Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java 2009-07-29 01:30:33 UTC (rev 5364) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThread.java 2009-07-29 02:01:11 UTC (rev 5365) @@ -1,101 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.pvm.internal.jobexecutor; - -import java.util.Collection; -import java.util.concurrent.BlockingQueue; - -import org.jbpm.internal.log.Log; -import org.jbpm.pvm.internal.cmd.CommandService; -import org.jbpm.pvm.internal.cmd.ExecuteJobCmd; - - -/** - * @author Tom Baeyens, Guillaume Porcher - */ -public class JobExecutorThread extends Thread { - - private static final Log log = Log.getLog(JobExecutorThread.class.getName()); - - JobExecutor jobExecutor; - boolean isActive = true; - - public JobExecutorThread(String name, JobExecutor jobExecutor) { - super(name); - this.jobExecutor = jobExecutor; - } - - public void run() { - log.info("starting..."); - try { - BlockingQueue<Collection<Long>> queue = jobExecutor.getJobDbidsQueue(); - if (queue == null) { - log.debug("no queue to take jobs from"); - } else { - while (isActive) { - try { - log.trace("taking jobs from queue"); - Collection<Long> jobDbids = null; - jobDbids = queue.take(); - log.debug("took job(s) "+jobDbids+" from queue"); - - for (Long jobDbid: jobDbids) { - CommandService commandService = jobExecutor.getCommandExecutor(); - commandService.execute(new ExecuteJobCmd(jobDbid)); - } - } catch (InterruptedException e) { - log.trace("waiting for acquired jobs got interrupted"); - } catch (Exception e) { - log.error("exception in job executor thread", e); - } - } - } - } catch (Throwable t) { - t.printStackTrace(); - } finally { - log.info(getName()+" leaves cyberspace"); - } - } - - public void deactivate() { - deactivate(false); - } - - public void deactivate(boolean join) { - if (isActive) { - log.trace("deactivating "+getName()); - isActive = false; - interrupt(); - if (join) { - while (isAlive()) { - try { - join(); - } catch (InterruptedException e) { - log.trace("joining "+getName()+" got interrupted"); - } - } - } - } else { - log.trace("ignoring deactivate: "+getName()+" is not active"); - } - } -} Deleted: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThreadPool.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThreadPool.java 2009-07-29 01:30:33 UTC (rev 5364) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobExecutorThreadPool.java 2009-07-29 02:01:11 UTC (rev 5365) @@ -1,85 +0,0 @@ -/* - * JBoss, Home of Professional Open Source - * Copyright 2005, JBoss Inc., and individual contributors as indicated - * by the @authors tag. See the copyright.txt in the distribution for a - * full listing of individual contributors. - * - * This is free software; you can redistribute it and/or modify it - * under the terms of the GNU Lesser General Public License as - * published by the Free Software Foundation; either version 2.1 of - * the License, or (at your option) any later version. - * - * This software is distributed in the hope that it will be useful, - * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU - * Lesser General Public License for more details. - * - * You should have received a copy of the GNU Lesser General Public - * License along with this software; if not, write to the Free - * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA - * 02110-1301 USA, or see the FSF site: http://www.fsf.org. - */ -package org.jbpm.pvm.internal.jobexecutor; - -import java.util.ArrayList; -import java.util.List; - -import org.jbpm.internal.log.Log; - -/** - * @author Tom Baeyens - */ -public class JobExecutorThreadPool { - - private static final Log log = Log.getLog(JobExecutorThreadPool.class.getName()); - - List<JobExecutorThread> jobExecutorThreads = new ArrayList<JobExecutorThread>(); - JobExecutor jobExecutor; - - public JobExecutorThreadPool(JobExecutor jobExecutor) { - this.jobExecutor = jobExecutor; - } - - public JobExecutorThread startThread() { - String threadName = getNextThreadName(); - JobExecutorThread jobExecutorThread = new JobExecutorThread(threadName, jobExecutor); - jobExecutorThreads.add(jobExecutorThread); - log.trace("starting "+threadName); - jobExecutorThread.start(); - return jobExecutorThread; - } - - public JobExecutorThread stopThread() { - JobExecutorThread thread = null; - int lastIndex = jobExecutorThreads.size()-1; - if (lastIndex>=0) { - thread = (JobExecutorThread) jobExecutorThreads.remove(lastIndex); - thread.deactivate(); - } - return thread; - } - - public void start() { - for (int i=0; i<jobExecutor.getNbrOfThreads(); i++) { - startThread(); - } - } - - public void deactivate() { - deactivate(false); - } - - public void deactivate(boolean join) { - for (JobExecutorThread jobExecutorThread : jobExecutorThreads) { - jobExecutorThread.deactivate(join); - } - } - - protected String getNextThreadName() { - return "JobExecutorThread" + jobExecutorThreads.size(); - } - - public List<JobExecutorThread> getJobExecutorThreads() { - return jobExecutorThreads; - } -} Added: jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobParcel.java =================================================================== --- jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobParcel.java (rev 0) +++ jbpm4/trunk/modules/pvm/src/main/java/org/jbpm/pvm/internal/jobexecutor/JobParcel.java 2009-07-29 02:01:11 UTC (rev 5365) @@ -0,0 +1,54 @@ +/* + * JBoss, Home of Professional Open Source + * Copyright 2005, JBoss Inc., and individual contributors as indicated + * by the @authors tag. See the copyright.txt in the distribution for a + * full listing of individual contributors. + * + * This is free software; you can redistribute it and/or modify it + * under the terms of the GNU Lesser General Public License as + * published by the Free Software Foundation; either version 2.1 of + * the License, or (at your option) any later version. + * + * This software is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU + * Lesser General Public License for more details. + * + * You should have received a copy of the GNU Lesser General Public + * License along with this software; if not, write to the Free + * Software Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA + * 02110-1301 USA, or see the FSF site: http://www.fsf.org. + */ +package org.jbpm.pvm.internal.jobexecutor; + +import java.util.Collection; + +import org.jbpm.internal.log.Log; +import org.jbpm.pvm.internal.cmd.CommandService; +import org.jbpm.pvm.internal.cmd.ExecuteJobCmd; + +/** + * @author Alejandro Guizar + */ +public class JobParcel implements Runnable { + + private static final Log log = Log.getLog(JobParcel.class.getName()); + + private final CommandService commandService; + private final Collection<Long> jobDbids; + + public JobParcel(CommandService commandService, Collection<Long> jobDbids) { + this.commandService = commandService; + this.jobDbids = jobDbids; + } + + public void run() { + try { + for (Long jobDbid : jobDbids) { + commandService.execute(new ExecuteJobCmd(jobDbid)); + } + } catch (RuntimeException e) { + log.error("exception in job block", e); + } + } +}

15 years, 3 months

1
0
0 / 0

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

jbpm-commits July 2009