[overlord-commits] Overlord SVN: r889 - in report-server/branches/report-server-1.1.x: core and 3 other directories.
overlord-commits at lists.jboss.org
overlord-commits at lists.jboss.org
Wed Nov 4 15:06:44 EST 2009
Author: heiko.braun at jboss.com
Date: 2009-11-04 15:06:43 -0500 (Wed, 04 Nov 2009)
New Revision: 889
Modified:
report-server/branches/report-server-1.1.x/core/pom.xml
report-server/branches/report-server-1.1.x/core/src/main/java/org/jboss/bpm/report/JMXServerConfig.java
report-server/branches/report-server-1.1.x/core/src/main/java/org/jboss/bpm/report/ReportFacade.java
report-server/branches/report-server-1.1.x/pom.xml
report-server/branches/report-server-1.1.x/report-server.iml
report-server/branches/report-server-1.1.x/report-server.iws
report-server/branches/report-server-1.1.x/server/pom.xml
report-server/branches/report-server-1.1.x/shared/pom.xml
Log:
Initialize BirtService based on -Dcatalina.home as a fallback
Modified: report-server/branches/report-server-1.1.x/core/pom.xml
===================================================================
--- report-server/branches/report-server-1.1.x/core/pom.xml 2009-11-04 19:29:01 UTC (rev 888)
+++ report-server/branches/report-server-1.1.x/core/pom.xml 2009-11-04 20:06:43 UTC (rev 889)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.bpm</groupId>
<artifactId>report-parent</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: report-server/branches/report-server-1.1.x/core/src/main/java/org/jboss/bpm/report/JMXServerConfig.java
===================================================================
--- report-server/branches/report-server-1.1.x/core/src/main/java/org/jboss/bpm/report/JMXServerConfig.java 2009-11-04 19:29:01 UTC (rev 888)
+++ report-server/branches/report-server-1.1.x/core/src/main/java/org/jboss/bpm/report/JMXServerConfig.java 2009-11-04 20:06:43 UTC (rev 889)
@@ -34,119 +34,124 @@
*/
public class JMXServerConfig
{
- // The MBeanServer
- private MBeanServer mbeanServer;
+ // The MBeanServer
+ private MBeanServer mbeanServer;
- public JMXServerConfig()
- {
- this.mbeanServer = getDefaultMBeanServer();
- }
+ public JMXServerConfig()
+ {
+ this.mbeanServer = getDefaultMBeanServer();
+ }
- public MBeanServer getMbeanServer()
- {
- return mbeanServer;
- }
+ public MBeanServer getMbeanServer()
+ {
+ return mbeanServer;
+ }
- public void setMbeanServer(MBeanServer mbeanServer)
- {
- this.mbeanServer = mbeanServer;
- }
+ public void setMbeanServer(MBeanServer mbeanServer)
+ {
+ this.mbeanServer = mbeanServer;
+ }
- public File getServerTempDir()
- {
- try
- {
- ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- File dir = (File)getMbeanServer().getAttribute(oname, "ServerTempDir");
- return dir;
+ public File getServerTempDir()
+ {
+ try
+ {
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ File dir = (File)getMbeanServer().getAttribute(oname, "ServerTempDir");
+ return dir;
+ }
+ catch (JMException e)
+ {
+ return null;
+ }
+ }
+
+ public File getHomeDir()
+ {
+ try
+ {
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ File dir = (File)getMbeanServer().getAttribute(oname, "HomeDir");
+ return dir;
+ }
+ catch (JMException e)
+ {
+ return null;
+ }
+ }
+
+ public File getServerDataDir()
+ {
+ try
+ {
+ ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
+ File dir = (File)getMbeanServer().getAttribute(oname, "ServerDataDir");
+ return dir;
+ }
+ catch (JMException e)
+ {
+ return null;
+ }
+ }
+
+ public static MBeanServer getDefaultMBeanServer() {
+ return findMBeanServer("jboss");
+ }
+
+ private static MBeanServer findMBeanServer(String agentId) {
+ MBeanServer server = null;
+ List servers = MBeanServerFactory.findMBeanServer(null);
+ if (servers != null && servers.size() > 0) {
+ for (Object object : servers) {
+ MBeanServer tmp = (MBeanServer) object;
+ if (tmp.getDefaultDomain().equals(agentId)) {
+ server = tmp;
+ break;
+ }
}
- catch (JMException e)
- {
- return null;
- }
- }
+ }
+ if(null==server)
+ throw new IllegalStateException("Unable to initialize MBeanServer");
+
+ return server;
+ }
- public File getHomeDir()
- {
+ public static class ObjectNameFactory
+ {
+ public static ObjectName create(String name)
+ {
try
{
- ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- File dir = (File)getMbeanServer().getAttribute(oname, "HomeDir");
- return dir;
+ return new ObjectName(name);
}
- catch (JMException e)
+ catch (MalformedObjectNameException e)
{
- return null;
+ throw new Error("Invalid ObjectName: " + name + "; " + e);
}
- }
+ }
- public File getServerDataDir()
- {
+ public static ObjectName create(String domain, String key, String value)
+ {
try
{
- ObjectName oname = ObjectNameFactory.create("jboss.system:type=ServerConfig");
- File dir = (File)getMbeanServer().getAttribute(oname, "ServerDataDir");
- return dir;
+ return new ObjectName(domain, key, value);
}
- catch (JMException e)
+ catch (MalformedObjectNameException e)
{
- return null;
+ throw new Error("Invalid ObjectName: " + domain + "," + key + "," + value + "; " + e);
}
- }
+ }
- public static MBeanServer getDefaultMBeanServer() {
- return findMBeanServer("jboss");
- }
-
- private static MBeanServer findMBeanServer(String agentId) {
- List servers = MBeanServerFactory.findMBeanServer(null);
- if (servers != null && servers.size() > 0) {
- for (Object object : servers) {
- MBeanServer server = (MBeanServer) object;
- if (server.getDefaultDomain().equals(agentId)) {
- return server;
- }
- }
- }
- return null;
- }
-
- public static class ObjectNameFactory
- {
- public static ObjectName create(String name)
+ public static ObjectName create(String domain, Hashtable table)
+ {
+ try
{
- try
- {
- return new ObjectName(name);
- }
- catch (MalformedObjectNameException e)
- {
- throw new Error("Invalid ObjectName: " + name + "; " + e);
- }
+ return new ObjectName(domain, table);
}
-
- public static ObjectName create(String domain, String key, String value)
+ catch (MalformedObjectNameException e)
{
- try
- {
- return new ObjectName(domain, key, value);
- }
- catch (MalformedObjectNameException e)
- {
- throw new Error("Invalid ObjectName: " + domain + "," + key + "," + value + "; " + e);
- }
+ throw new Error("Invalid ObjectName: " + domain + "," + table + "; " + e);
}
-
- public static ObjectName create(String domain, Hashtable table)
- {
- try
- {
- return new ObjectName(domain, table);
- }
- catch (MalformedObjectNameException e)
- {
- throw new Error("Invalid ObjectName: " + domain + "," + table + "; " + e);
- }
- }
- }
+ }
+ }
}
Modified: report-server/branches/report-server-1.1.x/core/src/main/java/org/jboss/bpm/report/ReportFacade.java
===================================================================
--- report-server/branches/report-server-1.1.x/core/src/main/java/org/jboss/bpm/report/ReportFacade.java 2009-11-04 19:29:01 UTC (rev 888)
+++ report-server/branches/report-server-1.1.x/core/src/main/java/org/jboss/bpm/report/ReportFacade.java 2009-11-04 20:06:43 UTC (rev 889)
@@ -81,12 +81,11 @@
{
if(!isInitialized)
{
- JMXServerConfig jmxConfig = new JMXServerConfig();
+ File serverDataDir = resolveDataDir();
+
IntegrationConfig iConfig = new IntegrationConfig();
+ String absServerDataDir = serverDataDir.getAbsolutePath();
- File severDataDir = jmxConfig.getServerDataDir();
- String absServerDataDir = severDataDir.getAbsolutePath();
-
String birtDataDir = absServerDataDir + "/birt";
String defaultBirtHome = birtDataDir + "/ReportEngine";
String birtOutputDir = birtDataDir + "/output";
@@ -122,6 +121,28 @@
}
}
+ private File resolveDataDir()
+ {
+ JMXServerConfig jmxConfig = null;
+ File serverDataDir = null;
+ try
+ {
+ jmxConfig = new JMXServerConfig();
+ serverDataDir = jmxConfig.getServerDataDir();
+ }
+ catch (Exception e)
+ {
+ // fallback on on CATALINA_HOME or blow up
+ log.warn("Resolving serverDataDir based on -Dcatalina.home");
+ if(System.getProperty("catalina.home")!=null)
+ serverDataDir = new File(System.getProperty("catalina.home"));
+ else
+ throw new IllegalStateException("Neither JMX config nor '-Dcatalina.home' available to resolve serverDataDir");
+ }
+
+ return serverDataDir;
+ }
+
@GET
@Path("render/{fileName}")
@Produces("text/html")
Modified: report-server/branches/report-server-1.1.x/pom.xml
===================================================================
--- report-server/branches/report-server-1.1.x/pom.xml 2009-11-04 19:29:01 UTC (rev 888)
+++ report-server/branches/report-server-1.1.x/pom.xml 2009-11-04 20:06:43 UTC (rev 889)
@@ -4,7 +4,7 @@
<name>JBoss BPM - Reporting (BIRT Integration)</name>
<groupId>org.jboss.bpm</groupId>
<artifactId>report-parent</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1</version>
<packaging>pom</packaging>
<!-- Parent -->
Modified: report-server/branches/report-server-1.1.x/report-server.iml
===================================================================
--- report-server/branches/report-server-1.1.x/report-server.iml 2009-11-04 19:29:01 UTC (rev 888)
+++ report-server/branches/report-server-1.1.x/report-server.iml 2009-11-04 20:06:43 UTC (rev 889)
@@ -9,13 +9,14 @@
<sourceFolder url="file://$MODULE_DIR$/server/src/main/java" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/server/src/main/resources" isTestSource="false" />
<sourceFolder url="file://$MODULE_DIR$/shared/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/shared/src/main/resources" isTestSource="false" />
</content>
<orderEntry type="inheritedJdk" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="module-library" exported="">
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-logging/commons-logging/1.1.1/commons-logging-1.1.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -24,7 +25,7 @@
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-discovery/commons-discovery/0.2/commons-discovery-0.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -33,7 +34,7 @@
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-cli/commons-cli/1.0/commons-cli-1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -42,7 +43,7 @@
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/commons-codec/commons-codec/1.3/commons-codec-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES>
@@ -54,7 +55,7 @@
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/w3c/sac/1.3/sac-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -63,7 +64,7 @@
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/rhino/js/1.6R2/js-1.6R2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -72,7 +73,7 @@
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/lowagie/itext/1.3/itext-1.3.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -81,7 +82,7 @@
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/w3c/flute/1.2/flute-1.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -90,7 +91,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.servlet:servlet-api:jar:2.4:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/servlet/servlet-api/2.4/servlet-api-2.4.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -99,7 +100,7 @@
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/modelapi/2.3.2/modelapi-2.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -108,7 +109,7 @@
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dataadapterapi/2.3.2/dataadapterapi-2.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -117,7 +118,7 @@
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/chartengineapi/2.3.2/chartengineapi-2.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -126,7 +127,7 @@
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/scriptapi/2.3.2/scriptapi-2.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -135,7 +136,7 @@
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/engineapi/2.3.2/engineapi-2.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -144,7 +145,7 @@
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/dteapi/2.3.2/dteapi-2.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -153,7 +154,7 @@
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/birt/coreapi/2.3.2/coreapi-2.3.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -162,7 +163,7 @@
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/common/2.4.0/common-2.4.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -171,7 +172,7 @@
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/ecore-xmi/2.4.1/ecore-xmi-2.4.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -180,7 +181,7 @@
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/eclipse/emf/ecore/2.4.2/ecore-2.4.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -189,7 +190,7 @@
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/ibm/icu/icu4j/3.8.1/icu4j-3.8.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -198,7 +199,7 @@
<orderEntry type="module-library" exported="">
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/com/google/code/gson/gson/1.2.2/gson-1.2.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -207,7 +208,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.slf4j:slf4j-simple:jar:1.5.2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/slf4j/slf4j-simple/1.5.2/slf4j-simple-1.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -216,7 +217,7 @@
<orderEntry type="module-library" exported="">
<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!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/junit/junit/3.8.1/junit-3.8.1.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -225,7 +226,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.resteasy:resteasy-jaxrs:jar:1.0.2.GA:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/resteasy/resteasy-jaxrs/1.0.2.GA/resteasy-jaxrs-1.0.2.GA.jar!/" />
+ <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 />
@@ -234,7 +235,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: javax.annotation:jsr250-api:jar:1.0:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javax/annotation/jsr250-api/1.0/jsr250-api-1.0.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -243,7 +244,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.slf4j:slf4j-api:jar:1.5.2:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/org/slf4j/slf4j-api/1.5.2/slf4j-api-1.5.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -252,7 +253,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: javassist:javassist:jar:3.6.0.GA:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" />
+ <root url="jar://$MODULE_DIR$/../../../../../../.m2/repository/javassist/javassist/3.6.0.GA/javassist-3.6.0.GA.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
@@ -261,7 +262,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.jboss.resteasy:jaxrs-api:jar:1.0.2.GA:provided">
<CLASSES>
- <root url="jar://$MODULE_DIR$/../../../../../.m2/repository/org/jboss/resteasy/jaxrs-api/1.0.2.GA/jaxrs-api-1.0.2.GA.jar!/" />
+ <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 />
@@ -270,7 +271,7 @@
<orderEntry type="module-library" exported="">
<library name="M2 Dep: org.scannotation:scannotation:jar:1.0.2: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/org/scannotation/scannotation/1.0.2/scannotation-1.0.2.jar!/" />
</CLASSES>
<JAVADOC />
<SOURCES />
Modified: report-server/branches/report-server-1.1.x/report-server.iws
===================================================================
--- report-server/branches/report-server-1.1.x/report-server.iws 2009-11-04 19:29:01 UTC (rev 888)
+++ report-server/branches/report-server-1.1.x/report-server.iws 2009-11-04 20:06:43 UTC (rev 889)
@@ -128,28 +128,18 @@
<component name="FavoritesManager">
<favorites_list name="report-server" />
</component>
- <component name="FavoritesProjectViewPane" />
+ <component name="FavoritesProjectViewPane">
+ <subPane subId="report-server">
+ <PATH>
+ <PATH_ELEMENT>
+ <option name="myItemId" />
+ <option name="myItemType" value="com.intellij.ide.favoritesTreeView.FavoritesTreeNodeDescriptor" />
+ </PATH_ELEMENT>
+ </PATH>
+ </subPane>
+ </component>
<component name="FileEditorManager">
- <leaf>
- <file leaf-file-name="BirtService.java" pinned="false" current="false" current-in-tab="false">
- <entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/bpm/report/BirtService.java">
- <provider selected="true" editor-type-id="text-editor">
- <state line="87" column="52" selection-start="3099" selection-end="3099" vertical-scroll-proportion="0.026143791">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- <file leaf-file-name="sample-reports.xml" pinned="false" current="true" current-in-tab="true">
- <entry file="file://$PROJECT_DIR$/core/src/main/resources/sample-reports.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="9" column="19" selection-start="412" selection-end="412" vertical-scroll-proportion="0.22966507">
- <folding />
- </state>
- </provider>
- </entry>
- </file>
- </leaf>
+ <leaf />
</component>
<component name="FindManager">
<FindUsagesManager>
@@ -373,19 +363,19 @@
<showLibraryContents />
<hideEmptyPackages />
<abbreviatePackageNames />
- <showStructure PackagesPane="false" Scope="false" ProjectPane="false" />
+ <showStructure Favorites="false" PackagesPane="false" Scope="false" ProjectPane="false" />
<autoscrollToSource />
<autoscrollFromSource />
<sortByType />
</navigator>
</component>
<component name="PropertiesComponent">
- <property name="MemberChooser.copyJavadoc" value="false" />
- <property name="GoToClass.includeLibraries" value="false" />
- <property name="MemberChooser.showClasses" value="true" />
- <property name="MemberChooser.sorted" value="false" />
<property name="GoToFile.includeJavaFiles" value="false" />
<property name="GoToClass.toSaveIncludeLibraries" value="false" />
+ <property name="MemberChooser.sorted" value="false" />
+ <property name="MemberChooser.showClasses" value="true" />
+ <property name="GoToClass.includeLibraries" value="false" />
+ <property name="MemberChooser.copyJavadoc" value="false" />
</component>
<component name="ReadonlyStatusHandler">
<option name="SHOW_DIALOG" value="true" />
@@ -393,15 +383,12 @@
<component name="RecentsManager" />
<component name="RestoreUpdateTree" />
<component name="RunManager">
- <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
- <option name="MAIN_CLASS_NAME" />
- <option name="VM_PARAMETERS" />
- <option name="PROGRAM_PARAMETERS" />
- <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
- <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
- <option name="ALTERNATIVE_JRE_PATH" />
- <option name="ENABLE_SWING_INSPECTOR" value="false" />
- <module name="" />
+ <configuration default="true" type="Remote" factoryName="Remote">
+ <option name="USE_SOCKET_TRANSPORT" value="true" />
+ <option name="SERVER_MODE" value="false" />
+ <option name="SHMEM_ADDRESS" value="javadebug" />
+ <option name="HOST" value="localhost" />
+ <option name="PORT" value="5005" />
</configuration>
<configuration default="true" type="JUnit" factoryName="JUnit" enabled="false" merge="false">
<module name="" />
@@ -422,6 +409,16 @@
<option name="Make" value="true" />
</method>
</configuration>
+ <configuration default="true" type="Application" factoryName="Application" enabled="false" merge="false">
+ <option name="MAIN_CLASS_NAME" />
+ <option name="VM_PARAMETERS" />
+ <option name="PROGRAM_PARAMETERS" />
+ <option name="WORKING_DIRECTORY" value="$PROJECT_DIR$" />
+ <option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
+ <option name="ALTERNATIVE_JRE_PATH" />
+ <option name="ENABLE_SWING_INSPECTOR" value="false" />
+ <module name="" />
+ </configuration>
<configuration default="true" type="Applet" factoryName="Applet">
<module name="" />
<option name="MAIN_CLASS_NAME" />
@@ -434,13 +431,6 @@
<option name="ALTERNATIVE_JRE_PATH_ENABLED" value="false" />
<option name="ALTERNATIVE_JRE_PATH" />
</configuration>
- <configuration default="true" type="Remote" factoryName="Remote">
- <option name="USE_SOCKET_TRANSPORT" value="true" />
- <option name="SERVER_MODE" value="false" />
- <option name="SHMEM_ADDRESS" value="javadebug" />
- <option name="HOST" value="localhost" />
- <option name="PORT" value="5005" />
- </configuration>
<configuration name="<template>" type="WebApp" default="true" selected="false">
<Host>localhost</Host>
<Port>5050</Port>
@@ -522,34 +512,34 @@
</component>
<component name="ToolWindowManager">
<frame x="0" y="22" width="1280" height="774" extended-state="6" />
- <editor active="true" />
+ <editor active="false" />
<layout>
<window_info id="UI Designer" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
- <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+ <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+ <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
+ <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
+ <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3299363" order="1" />
+ <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="4" />
+ <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="IDEtalk" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
+ <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+ <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="TODO" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="7" />
- <window_info id="Project" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.30625507" order="0" />
- <window_info id="Find" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.3299363" order="1" />
+ <window_info id="Maven" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="Structure" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
- <window_info id="Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
- <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
+ <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" />
+ <window_info id="CVS" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
<window_info id="Module Dependencies" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
<window_info id="Dependency Viewer" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
- <window_info id="Palette" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
- <window_info id="Ant Build" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="1" />
- <window_info id="Changes" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
- <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" />
- <window_info id="Maven" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
- <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
<window_info id="File View" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="3" />
- <window_info id="Debug" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="4" />
- <window_info id="Commander" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="0" />
- <window_info id="IDEtalk Messages" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
- <window_info id="Version Control" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="8" />
+ <window_info id="Project" active="true" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="true" weight="0.22664501" order="0" />
+ <window_info id="Hierarchy" active="false" anchor="right" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
+ <window_info id="Inspection" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.4" order="6" />
+ <window_info id="Run" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="2" />
+ <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" />
<window_info id="Message" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.33" order="0" />
<window_info id="Web" active="false" anchor="left" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="2" />
<window_info id="EJB" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="3" />
- <window_info id="Cvs" active="false" anchor="bottom" auto_hide="false" internal_type="DOCKED" type="DOCKED" visible="false" weight="0.25" order="5" />
</layout>
</component>
<component name="VCS.FileViewConfiguration">
@@ -676,18 +666,11 @@
</entry>
<entry file="file://$PROJECT_DIR$/core/src/main/java/org/jboss/bpm/report/BirtService.java">
<provider selected="true" editor-type-id="text-editor">
- <state line="87" column="52" selection-start="3099" selection-end="3099" vertical-scroll-proportion="0.026143791">
+ <state line="87" column="52" selection-start="3059" selection-end="3059" vertical-scroll-proportion="0.026143791">
<folding />
</state>
</provider>
</entry>
- <entry file="file://$PROJECT_DIR$/core/src/main/resources/sample-reports.xml">
- <provider selected="true" editor-type-id="text-editor">
- <state line="9" column="19" selection-start="412" selection-end="412" vertical-scroll-proportion="0.22966507">
- <folding />
- </state>
- </provider>
- </entry>
</component>
</project>
Modified: report-server/branches/report-server-1.1.x/server/pom.xml
===================================================================
--- report-server/branches/report-server-1.1.x/server/pom.xml 2009-11-04 19:29:01 UTC (rev 888)
+++ report-server/branches/report-server-1.1.x/server/pom.xml 2009-11-04 20:06:43 UTC (rev 889)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.bpm</groupId>
<artifactId>report-parent</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
Modified: report-server/branches/report-server-1.1.x/shared/pom.xml
===================================================================
--- report-server/branches/report-server-1.1.x/shared/pom.xml 2009-11-04 19:29:01 UTC (rev 888)
+++ report-server/branches/report-server-1.1.x/shared/pom.xml 2009-11-04 20:06:43 UTC (rev 889)
@@ -10,7 +10,7 @@
<parent>
<groupId>org.jboss.bpm</groupId>
<artifactId>report-parent</artifactId>
- <version>1.1.0</version>
+ <version>1.1.1</version>
<relativePath>../pom.xml</relativePath>
</parent>
More information about the overlord-commits
mailing list