incubator-hise-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From wi...@apache.org
Subject svn commit: r1139226 - in /incubator/hise/trunk: hise-bundle/ hise-distro/src/distro/examples/osgi/claimsHandling/ hise-examples/osgi/claims-handling-karaf/ hise-karaf/ hise-services/src/main/java/org/apache/hise/dao/
Date Fri, 24 Jun 2011 09:52:53 GMT
Author: witek
Date: Fri Jun 24 09:52:53 2011
New Revision: 1139226

URL: http://svn.apache.org/viewvc?rev=1139226&view=rev
Log:
log objects preventing entity manager instantiation removed

Modified:
    incubator/hise/trunk/hise-bundle/pom.xml
    incubator/hise/trunk/hise-distro/src/distro/examples/osgi/claimsHandling/pom.xml
    incubator/hise/trunk/hise-examples/osgi/claims-handling-karaf/pom.xml
    incubator/hise/trunk/hise-karaf/pom.xml
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Comment.java
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Message.java
    incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java

Modified: incubator/hise/trunk/hise-bundle/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-bundle/pom.xml?rev=1139226&r1=1139225&r2=1139226&view=diff
==============================================================================
--- incubator/hise/trunk/hise-bundle/pom.xml (original)
+++ incubator/hise/trunk/hise-bundle/pom.xml Fri Jun 24 09:52:53 2011
@@ -38,30 +38,30 @@
             <plugin>
                 <groupId>org.apache.felix</groupId>
                 <artifactId>maven-bundle-plugin</artifactId>
-				<!--version>1.4.3</version-->
+				<version>1.4.3</version>
 				<extensions>true</extensions>
                 <configuration>
                     <instructions>
                         <Bundle-SymbolicName>${pom.artifactId}</Bundle-SymbolicName>
                         <Import-Package>
-javax.persistence,
-javax.xml.bind,
-javax.xml.soap,
-META-INF.cxf,
-META-INF.cxf.osgi,
-org.apache.cxf.resource,
-org.apache.cxf.binding.soap.spring,
-org.apache.cxf.ws.security.wss4j,
-org.apache.cxf.jaxws.spi,
-org.apache.openjpa.persistence,
-javax.security.auth.callback,
-org.apache.ws.security,
-net.sf.saxon.xpath,
-org.springframework.osgi.config,
-org.springframework.osgi.context,
-org.springframework.osgi.context.support,
-org.springframework.osgi.service,
-org.springframework.osgi.service.importer
+                            javax.persistence,
+                            javax.xml.bind,
+                            javax.xml.soap,
+                            META-INF.cxf,
+                            META-INF.cxf.osgi,
+                            org.apache.cxf.resource,
+                            org.apache.cxf.binding.soap.spring,
+                            org.apache.cxf.ws.security.wss4j,
+                            org.apache.cxf.jaxws.spi,
+                            org.apache.openjpa.persistence,
+                            javax.security.auth.callback,
+                            org.apache.ws.security,
+                            net.sf.saxon.xpath,
+                            org.springframework.osgi.config,
+                            org.springframework.osgi.context,
+                            org.springframework.osgi.context.support,
+                            org.springframework.osgi.service,
+                            org.springframework.osgi.service.importer
                         </Import-Package>
                         <Export-Package>org.apache.hise*,org.w3._2001.xmlschema,schemaorg_apache_xmlbeans*</Export-Package>
                         <DynamicImport-Package>*</DynamicImport-Package>

Modified: incubator/hise/trunk/hise-distro/src/distro/examples/osgi/claimsHandling/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-distro/src/distro/examples/osgi/claimsHandling/pom.xml?rev=1139226&r1=1139225&r2=1139226&view=diff
==============================================================================
--- incubator/hise/trunk/hise-distro/src/distro/examples/osgi/claimsHandling/pom.xml (original)
+++ incubator/hise/trunk/hise-distro/src/distro/examples/osgi/claimsHandling/pom.xml Fri Jun
24 09:52:53 2011
@@ -40,18 +40,16 @@
                             javax.xml.soap,
                             META-INF.cxf,
                             META-INF.cxf.osgi,
-org.apache.hise,
-
+                            org.apache.hise,
                             org.apache.cxf.resource,
                             org.apache.cxf.binding.soap.spring,
                             org.springframework.beans,
                             org.apache.cxf.jaxws.spi,
-
-   org.springframework.osgi.config,
-   org.springframework.osgi.context,
-   org.springframework.osgi.context.support,
-   org.springframework.osgi.service,
-   org.springframework.osgi.service.importer,
+                            org.springframework.osgi.config,
+                            org.springframework.osgi.context,
+                            org.springframework.osgi.context.support,
+                            org.springframework.osgi.service,
+                            org.springframework.osgi.service.importer,
                         </Import-Package>
                         <!--
                         <Private-Package>org.apache.hise*</Private-Package>
@@ -66,8 +64,7 @@ org.apache.hise,
                         <!--
 
                         <DynamicImport-Package>org.w3.*,javax.xml.xquery</DynamicImport-Package>
-                            org.w3.*,
-			    net.sf.saxon*
+                            org.w3.*,net.sf.saxon*
                         <Embed-Dependency>saxon*,spring-orm,spring-jdbc,ojdbc5;scope=compile|runtime</Embed-Dependency>
                         <Embed-Dependency>saxon*,hise-wsdl;scope=compile|runtime</Embed-Dependency>
                         <Embed-Transitive>true</Embed-Transitive>

Modified: incubator/hise/trunk/hise-examples/osgi/claims-handling-karaf/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-examples/osgi/claims-handling-karaf/pom.xml?rev=1139226&r1=1139225&r2=1139226&view=diff
==============================================================================
--- incubator/hise/trunk/hise-examples/osgi/claims-handling-karaf/pom.xml (original)
+++ incubator/hise/trunk/hise-examples/osgi/claims-handling-karaf/pom.xml Fri Jun 24 09:52:53
2011
@@ -31,7 +31,6 @@
   <groupId>org.apache.hise.examples</groupId>
   <packaging>jar</packaging>
 
-
   <build>
     <resources>
       <resource>
@@ -43,6 +42,7 @@
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-resources-plugin</artifactId>
+        <version>1.5</version>
         <executions>
            <execution>
               <id>filter</id>

Modified: incubator/hise/trunk/hise-karaf/pom.xml
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-karaf/pom.xml?rev=1139226&r1=1139225&r2=1139226&view=diff
==============================================================================
--- incubator/hise/trunk/hise-karaf/pom.xml (original)
+++ incubator/hise/trunk/hise-karaf/pom.xml Fri Jun 24 09:52:53 2011
@@ -50,8 +50,9 @@
         </executions>
       </plugin>
       <plugin>
-        <groupId>org.codehaus.mojo</groupId>
+          <groupId>org.codehaus.mojo</groupId>
           <artifactId>build-helper-maven-plugin</artifactId>
+          <version>1.5</version>
           <executions>
             <execution>
               <id>attach-artifacts</id>

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Comment.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Comment.java?rev=1139226&r1=1139225&r2=1139226&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Comment.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Comment.java Fri
Jun 24 09:52:53 2011
@@ -19,18 +19,9 @@
 
 package org.apache.hise.dao;
 
+import javax.persistence.*;
 import java.util.Date;
 
-import javax.persistence.Column;
-import javax.persistence.Entity;
-import javax.persistence.GeneratedValue;
-import javax.persistence.Id;
-import javax.persistence.JoinColumn;
-import javax.persistence.ManyToOne;
-import javax.persistence.Table;
-import javax.persistence.Temporal;
-import javax.persistence.TemporalType;
-
 /**
  * Task content.
  *
@@ -59,7 +50,9 @@ public class Comment extends JpaBase {
     @JoinColumn(name = "TASK_ID")
     private Task task;
     
-    public Comment() {}
+    public Comment() {
+
+    }
 
     public Comment(final String content, final Task taskDto, final String userName) {
         this.content = content;

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Message.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Message.java?rev=1139226&r1=1139225&r2=1139226&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Message.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/Message.java Fri
Jun 24 09:52:53 2011
@@ -40,9 +40,7 @@ import org.apache.commons.logging.LogFac
 @Entity
 @Table(name = "HISE_MESSAGE")
 public class Message extends JpaBase {
-    
-    private final Log log = LogFactory.getLog(Message.class);
-    
+
     @Id
     @GeneratedValue
     private Long id;

Modified: incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java
URL: http://svn.apache.org/viewvc/incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java?rev=1139226&r1=1139225&r2=1139226&view=diff
==============================================================================
--- incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java (original)
+++ incubator/hise/trunk/hise-services/src/main/java/org/apache/hise/dao/OrgEntity.java Fri
Jun 24 09:52:53 2011
@@ -39,11 +39,6 @@ import javax.persistence.Table;
 @Table(name = "HISE_ENTITY")
 public class OrgEntity extends JpaBase {
 
-//    @Id
-//    @GeneratedValue(strategy = GenerationType.AUTO, generator = "asgn_seq")
-//    @SequenceGenerator(name = "asgn_seq", sequenceName = "asgn_seq")
-//    protected Long id;
-
     @Id
     private String name;
 



Mime
View raw message