Author: deepal
Date: Fri Dec 21 05:10:23 2007
New Revision: 11671

Log:

Fixing the build errors
 - And removed the servlet jar from the war

Modified:
   branches/registry/0_1/modules/core/pom.xml
   
branches/registry/0_1/modules/core/src/main/java/org/wso2/registry/app/AtomRegistry.java
   branches/registry/0_1/modules/webapps/pom.xml

Modified: branches/registry/0_1/modules/core/pom.xml
==============================================================================
--- branches/registry/0_1/modules/core/pom.xml  (original)
+++ branches/registry/0_1/modules/core/pom.xml  Fri Dec 21 05:10:23 2007
@@ -67,6 +67,7 @@
         <dependency>
             <groupId>javax.servlet</groupId>
             <artifactId>servlet-api</artifactId>
+            <scope>provided</scope>
         </dependency>
         <dependency>
             <groupId>org.wso2.commons.usermanager</groupId>

Modified: 
branches/registry/0_1/modules/core/src/main/java/org/wso2/registry/app/AtomRegistry.java
==============================================================================
--- 
branches/registry/0_1/modules/core/src/main/java/org/wso2/registry/app/AtomRegistry.java
    (original)
+++ 
branches/registry/0_1/modules/core/src/main/java/org/wso2/registry/app/AtomRegistry.java
    Fri Dec 21 05:10:23 2007
@@ -439,8 +439,10 @@
             feed.setUpdated(new Date());
         }
 //        resource.getCreatedTime()
-        feed.addSimpleExtension(new QName("createdTime"),
-                "" + resource.getCreatedTime().getTime());
+        if (resource.getCreatedTime() !=null) {
+            feed.addSimpleExtension(new QName("createdTime"),
+                    "" + resource.getCreatedTime().getTime());
+        }
         String href = baseURI + "atom" + path;
         feed.addLink(href);
         feed.addLink(href, "path");

Modified: branches/registry/0_1/modules/webapps/pom.xml
==============================================================================
--- branches/registry/0_1/modules/webapps/pom.xml       (original)
+++ branches/registry/0_1/modules/webapps/pom.xml       Fri Dec 21 05:10:23 2007
@@ -111,6 +111,7 @@
                 <groupId>javax.servlet</groupId>
                 <artifactId>servlet-api</artifactId>
                 <version>${servlet.api.version}</version>
+                <scope>provided</scope>
             </dependency>
         <dependency>
             <groupId>commons-logging</groupId>

_______________________________________________
Registry-dev mailing list
[email protected]
http://wso2.org/cgi-bin/mailman/listinfo/registry-dev

Reply via email to