[dcm4che-commits] SF.net SVN: dcm4che: [6355] dcm4chee/xero/trunk

[<way...@us...>]

Revision: 6355
          http://dcm4che.svn.sourceforge.net/dcm4che/?rev=6355&view=rev
Author:   wayfarer3130
Date:     2008-05-28 11:31:23 -0700 (Wed, 28 May 2008)

Log Message:
-----------
[#XER-76] Added a util package with shared components.

Modified Paths:
--------------
    dcm4chee/xero/trunk/model-xero/pom.xml
    dcm4chee/xero/trunk/view-xero/src/main/resources/ie/head.st
    dcm4chee/xero/trunk/view-xero/src/main/resources/xero/head.st
    dcm4chee/xero/trunk/view-xero/src/main/resources/xero/headCommon.st
    dcm4chee/xero/trunk/xero-ear/pom.xml
    dcm4chee/xero/trunk/xero-wado-war/pom.xml

Added Paths:
-----------
    dcm4chee/xero/trunk/util-xero/.classpath
    dcm4chee/xero/trunk/util-xero/.project
    dcm4chee/xero/trunk/util-xero/pom.xml
    dcm4chee/xero/trunk/util-xero/src/
    dcm4chee/xero/trunk/util-xero/src/main/
    dcm4chee/xero/trunk/util-xero/src/main/java/
    dcm4chee/xero/trunk/util-xero/src/main/java/org/
    dcm4chee/xero/trunk/util-xero/src/main/java/org/dcm4chee/
    dcm4chee/xero/trunk/util-xero/src/main/java/org/dcm4chee/xero/
    dcm4chee/xero/trunk/util-xero/src/main/java/org/dcm4chee/xero/servlet/
    dcm4chee/xero/trunk/util-xero/src/main/java/org/dcm4chee/xero/util/

Removed Paths:
-------------
    dcm4chee/xero/trunk/metadata/src/main/java/org/dcm4chee/xero/util/
    dcm4chee/xero/trunk/multi-template/
    dcm4chee/xero/trunk/wado-xero/src/main/java/org/dcm4chee/xero/servlet/

Modified: dcm4chee/xero/trunk/model-xero/pom.xml
===================================================================
--- dcm4chee/xero/trunk/model-xero/pom.xml	2008-05-28 17:56:18 UTC (rev 6354)
+++ dcm4chee/xero/trunk/model-xero/pom.xml	2008-05-28 18:31:23 UTC (rev 6355)
@@ -22,6 +22,11 @@
       <version>1.0-SNAPSHOT</version>
     </dependency>
     <dependency>
+      <groupId>org.dcm4chee.xero</groupId>
+      <artifactId>util-xero</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
       <groupId>javax.servlet</groupId>
       <artifactId>jsp-api</artifactId>
       <version>2.0</version>

Added: dcm4chee/xero/trunk/util-xero/.classpath
===================================================================
--- dcm4chee/xero/trunk/util-xero/.classpath	                        (rev 0)
+++ dcm4chee/xero/trunk/util-xero/.classpath	2008-05-28 18:31:23 UTC (rev 6355)
@@ -0,0 +1,7 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<classpath>
+	<classpathentry kind="src" path="src/main/java"/>
+	<classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER"/>
+	<classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
+	<classpathentry kind="output" path="target/classes"/>
+</classpath>

Added: dcm4chee/xero/trunk/util-xero/.project
===================================================================
--- dcm4chee/xero/trunk/util-xero/.project	                        (rev 0)
+++ dcm4chee/xero/trunk/util-xero/.project	2008-05-28 18:31:23 UTC (rev 6355)
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+	<name>util-xero</name>
+	<comment></comment>
+	<projects>
+	</projects>
+	<buildSpec>
+		<buildCommand>
+			<name>org.maven.ide.eclipse.maven2Builder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+		<buildCommand>
+			<name>org.eclipse.jdt.core.javabuilder</name>
+			<arguments>
+			</arguments>
+		</buildCommand>
+	</buildSpec>
+	<natures>
+		<nature>org.eclipse.jdt.core.javanature</nature>
+		<nature>org.maven.ide.eclipse.maven2Nature</nature>
+	</natures>
+</projectDescription>

Added: dcm4chee/xero/trunk/util-xero/pom.xml
===================================================================
--- dcm4chee/xero/trunk/util-xero/pom.xml	                        (rev 0)
+++ dcm4chee/xero/trunk/util-xero/pom.xml	2008-05-28 18:31:23 UTC (rev 6355)
@@ -0,0 +1,45 @@
+<?xml version="1.0"?>
+<project>
+  <parent>
+    <artifactId>xero</artifactId>
+    <groupId>org.dcm4chee.xero</groupId>
+    <version>1.0-SNAPSHOT</version>
+  </parent>
+  <modelVersion>4.0.0</modelVersion>
+  <artifactId>util-xero</artifactId>
+  <name>Xero Utilities</name>
+
+  <dependencies>
+    <dependency>
+      <groupId>org.dcm4chee.xero</groupId>
+      <artifactId>metadata</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>javax.servlet</groupId>
+      <artifactId>servlet-api</artifactId>
+      <version>2.4</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.embedded</groupId>
+      <artifactId>jboss-embedded-all</artifactId>
+      <version>beta3</version>
+      <scope>provided</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.jboss.embedded</groupId>
+      <artifactId>jboss-embedded</artifactId>
+      <version>beta3</version>
+      <scope>provided</scope>
+    </dependency>
+
+    <dependency>
+      <groupId>org.easymock</groupId>
+      <artifactId>easymock</artifactId>
+      <version>2.2</version>
+      <scope>test</scope>
+    </dependency>    
+  </dependencies>
+
+</project>

Copied: dcm4chee/xero/trunk/util-xero/src/main/java/org/dcm4chee/xero/servlet (from rev 6353, dcm4chee/xero/trunk/wado-xero/src/main/java/org/dcm4chee/xero/servlet)

Copied: dcm4chee/xero/trunk/util-xero/src/main/java/org/dcm4chee/xero/util (from rev 6352, dcm4chee/xero/trunk/metadata/src/main/java/org/dcm4chee/xero/util)

Modified: dcm4chee/xero/trunk/view-xero/src/main/resources/ie/head.st
===================================================================
--- dcm4chee/xero/trunk/view-xero/src/main/resources/ie/head.st	2008-05-28 17:56:18 UTC (rev 6354)
+++ dcm4chee/xero/trunk/view-xero/src/main/resources/ie/head.st	2008-05-28 18:31:23 UTC (rev 6355)
@@ -1,2 +1,2 @@
-  <script src="/xview/xeroViewIE.js" type="text/ecmascript"> </script>
+  <script src="xeroViewIE.js" type="text/ecmascript"> </script>
   <style> v\:* { behavior: url(#default#VML); } </style>
\ No newline at end of file

Modified: dcm4chee/xero/trunk/view-xero/src/main/resources/xero/head.st
===================================================================
--- dcm4chee/xero/trunk/view-xero/src/main/resources/xero/head.st	2008-05-28 17:56:18 UTC (rev 6354)
+++ dcm4chee/xero/trunk/view-xero/src/main/resources/xero/head.st	2008-05-28 18:31:23 UTC (rev 6355)
@@ -1 +1 @@
-  <script src="/xview/xeroView.js" type="text/ecmascript"> </script>
\ No newline at end of file
+  <script src="xeroView.js" type="text/ecmascript"> </script>
\ No newline at end of file

Modified: dcm4chee/xero/trunk/view-xero/src/main/resources/xero/headCommon.st
===================================================================
--- dcm4chee/xero/trunk/view-xero/src/main/resources/xero/headCommon.st	2008-05-28 17:56:18 UTC (rev 6354)
+++ dcm4chee/xero/trunk/view-xero/src/main/resources/xero/headCommon.st	2008-05-28 18:31:23 UTC (rev 6355)
@@ -1,11 +1,11 @@
 <head>
   <meta http-equiv="Content-Type" content="text/xhtml"/>
   <meta content="initial-scale=1.0" name="viewport"/>
-  <link type="text/css" rel="stylesheet" href="/xview/style/general.css"> </link>
+  <link type="text/css" rel="stylesheet" href="style/general.css"> </link>
   <title>Xero Query</title>
-  <script src="/xview/firebug/firebug.js" type="text/ecmascript" > </script>
-  <script src="/xview/js/Events.js" type="text/ecmascript"> </script>
-  <script src="/xview/js/sarissa.js" type="text/ecmascript"> </script>
+  <script src="firebug/firebug.js" type="text/ecmascript" > </script>
+  <script src="js/Events.js" type="text/ecmascript"> </script>
+  <script src="js/sarissa.js" type="text/ecmascript"> </script>
   $head()$
-  <script src="/xview/xeroModelController.js" type="text/ecmascript"> </script>
+  <script src="xeroModelController.js" type="text/ecmascript"> </script>
 </head>
\ No newline at end of file

Modified: dcm4chee/xero/trunk/xero-ear/pom.xml
===================================================================
--- dcm4chee/xero/trunk/xero-ear/pom.xml	2008-05-28 17:56:18 UTC (rev 6354)
+++ dcm4chee/xero/trunk/xero-ear/pom.xml	2008-05-28 18:31:23 UTC (rev 6355)
@@ -47,6 +47,11 @@
                 <artifactId>model-xero</artifactId>
                 <includeInApplicationXml>true</includeInApplicationXml>
              </jarModule>
+              <jarModule>
+                <groupId>org.dcm4chee.xero</groupId>
+                <artifactId>util-xero</artifactId>
+                <includeInApplicationXml>true</includeInApplicationXml>
+             </jarModule>
              <webModule>
                <groupId>org.dcm4chee.xero</groupId>
                <artifactId>xero-war</artifactId>
@@ -138,6 +143,12 @@
         <version>1.0-SNAPSHOT</version>
         <type>jar</type>
      </dependency>
+     <dependency>
+        <groupId>org.dcm4chee.xero</groupId>
+        <artifactId>util-xero</artifactId>
+        <version>1.0-SNAPSHOT</version>
+        <type>jar</type>
+     </dependency>
      <dependency>
         <groupId>org.dcm4chee.xero</groupId>
         <artifactId>xero-core</artifactId>

Modified: dcm4chee/xero/trunk/xero-wado-war/pom.xml
===================================================================
--- dcm4chee/xero/trunk/xero-wado-war/pom.xml	2008-05-28 17:56:18 UTC (rev 6354)
+++ dcm4chee/xero/trunk/xero-wado-war/pom.xml	2008-05-28 18:31:23 UTC (rev 6355)
@@ -21,6 +21,11 @@
     
     <dependency>
       <groupId>org.dcm4chee.xero</groupId>
+      <artifactId>util-xero</artifactId>
+      <version>1.0-SNAPSHOT</version>
+    </dependency>
+    <dependency>
+      <groupId>org.dcm4chee.xero</groupId>
       <artifactId>wado-xero</artifactId>
       <version>1.0-SNAPSHOT</version>
     </dependency>


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.