[lambico.archetypes] push by lucio.be...@gmail.com - Fixed som package and path generations. on 2013-09-29 04:44 GMT

[lam...@googlecode.com]

Revision: 5a97b06e8f8f
Branch: default
Author: lucio.benfante <lucio.b...@gmail.com>
Date: Sun Sep 29 04:43:24 2013 UTC
Log: Fixed som package and path generations.
http://code.google.com/p/lambico/source/detail?r=5a97b06e8f8f&repo=archetypes

Added:

/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/test/resources/__packageInPathFormat__/core/rest/client-beans-test.xml

/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/test/resources/__packageInPathFormat__/core/service/client-beans-test.xml
Deleted:

/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/test/resources/org/lambico/ws/archetype/template/core/rest/client-beans-test.xml

/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/test/resources/org/lambico/ws/archetype/template/core/service/client-beans-test.xml
Modified:

/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/main/java/core/bean/PageImpl.java

/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/main/java/core/bo/PersonBo.java

/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/main/java/core/dao/PersonDao.java

/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/main/java/core/po/Person.java

/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/main/java/core/rest/SampleService.java

/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/test/java/core/bo/PersonBoTest.java

/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/test/java/core/test/BaseRSTest.java

/lambico-ws-archetype/src/test/resources/projects/basic/reference/core/src/test/java/org/lambico/ws/archetype/template/core/test/BaseRSTest.java

=======================================
--- /dev/null
+++
/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/test/resources/__packageInPathFormat__/core/rest/client-beans-test.xml
Sun Sep 29 04:43:24 2013 UTC
@@ -0,0 +1,49 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (C) 2013 Lambico Team <in...@lambico.org>
+
+ This file is part of Lambico WS Archetype Template - Core.
+
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:security="http://www.springframework.org/schema/security"
+ xmlns:jaxrs="http://cxf.apache.org/jaxrs"
+ xmlns:cxf="http://cxf.apache.org/core"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
+ http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security-3.1.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
+
+ <bean id="sampleRestService"
class="${package}.core.rest.SampleService"/>
+
+ <bean id="securityFilter"
class="${package}.core.security.SecurityCXFJAXRSFilter">
+ <property name="users">
+ <map>
+ <entry key="username">
+ <bean class="${package}.core.security.User">
+ <property name="username" value="username"/>
+ <property name="password" value="password"/>
+ <property name="accountNonExpired" value="true"/>
+ <property name="accountNonLocked" value="true"/>
+ <property name="credentialsNonExpired"
value="true"/>
+ <property name="enabled" value="true"/>
+ <property name="authorities">
+ <set>
+ <bean
class="org.springframework.security.core.authority.SimpleGrantedAuthority">
+ <constructor-arg value="ROLE_DEFAULT"/>
+ </bean>
+ </set>
+ </property>
+ </bean>
+ </entry>
+ </map>
+ </property>
+ </bean>
+
+</beans>
=======================================
--- /dev/null
+++
/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/test/resources/__packageInPathFormat__/core/service/client-beans-test.xml
Sun Sep 29 04:43:24 2013 UTC
@@ -0,0 +1,22 @@
+#set( $symbol_pound = '#' )
+#set( $symbol_dollar = '$' )
+#set( $symbol_escape = '\' )
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Copyright (C) 2013 Lambico Team <in...@lambico.org>
+
+ This file is part of Lambico WS Archetype Template - Core.
+
+-->
+<beans xmlns="http://www.springframework.org/schema/beans"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:jaxws="http://cxf.apache.org/jaxws"
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
+
+<!-- <jaxws:client id="sampleSoapServiceClient"
serviceClass="${package}.core.service.SampleSoapService"
+ address="local://SampleSoapService" />-->
+
+</beans>
=======================================
---
/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/test/resources/org/lambico/ws/archetype/template/core/rest/client-beans-test.xml
Sat Sep 28 13:29:19 2013 UTC
+++ /dev/null
@@ -1,49 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (C) 2013 Lambico Team <in...@lambico.org>
-
- This file is part of Lambico WS Archetype Template - Core.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:security="http://www.springframework.org/schema/security"
- xmlns:jaxrs="http://cxf.apache.org/jaxrs"
- xmlns:cxf="http://cxf.apache.org/core"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans.xsd
- http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd
- http://www.springframework.org/schema/security
http://www.springframework.org/schema/security/spring-security-3.1.xsd
- http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd">
-
- <bean id="sampleRestService"
class="${package}.core.rest.SampleService"/>
-
- <bean id="securityFilter"
class="${package}.core.security.SecurityCXFJAXRSFilter">
- <property name="users">
- <map>
- <entry key="username">
- <bean class="${package}.core.security.User">
- <property name="username" value="username"/>
- <property name="password" value="password"/>
- <property name="accountNonExpired" value="true"/>
- <property name="accountNonLocked" value="true"/>
- <property name="credentialsNonExpired"
value="true"/>
- <property name="enabled" value="true"/>
- <property name="authorities">
- <set>
- <bean
class="org.springframework.security.core.authority.SimpleGrantedAuthority">
- <constructor-arg value="ROLE_DEFAULT"/>
- </bean>
- </set>
- </property>
- </bean>
- </entry>
- </map>
- </property>
- </bean>
-
-</beans>
=======================================
---
/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/test/resources/org/lambico/ws/archetype/template/core/service/client-beans-test.xml
Sat Sep 28 13:29:19 2013 UTC
+++ /dev/null
@@ -1,22 +0,0 @@
-#set( $symbol_pound = '#' )
-#set( $symbol_dollar = '$' )
-#set( $symbol_escape = '\' )
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (C) 2013 Lambico Team <in...@lambico.org>
-
- This file is part of Lambico WS Archetype Template - Core.
-
--->
-<beans xmlns="http://www.springframework.org/schema/beans"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:jaxws="http://cxf.apache.org/jaxws"
- xsi:schemaLocation="
- http://www.springframework.org/schema/beans
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
- http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd">
-
-<!-- <jaxws:client id="sampleSoapServiceClient"
serviceClass="${package}.core.service.SampleSoapService"
- address="local://SampleSoapService" />-->
-
-</beans>
=======================================
---
/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/main/java/core/bean/PageImpl.java
Sat Sep 28 13:29:19 2013 UTC
+++
/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/main/java/core/bean/PageImpl.java
Sun Sep 29 04:43:24 2013 UTC
@@ -10,7 +10,7 @@

import java.util.Collections;
import java.util.List;
-import ${groupId}.dao.generic.Page;
+import org.lambico.dao.generic.Page;

/**
* Bean for managing list paginations.
=======================================
---
/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/main/java/core/bo/PersonBo.java
Sat Sep 28 13:35:58 2013 UTC
+++
/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/main/java/core/bo/PersonBo.java
Sun Sep 29 04:43:24 2013 UTC
@@ -14,9 +14,9 @@
import java.util.List;
import javax.annotation.Resource;
import org.hibernate.criterion.DetachedCriteria;
-import ${groupId}.dao.generic.Page;
-import ${groupId}.dao.generic.PageDefaultImpl;
-import ${groupId}.dao.spring.hibernate.HibernateGenericDao;
+import org.lambico.dao.generic.Page;
+import org.lambico.dao.generic.PageDefaultImpl;
+import org.lambico.dao.spring.hibernate.HibernateGenericDao;
import ${package}.core.dao.PersonDao;
import ${package}.core.po.Person;
import org.slf4j.Logger;
=======================================
---
/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/main/java/core/dao/PersonDao.java
Sat Sep 28 13:35:58 2013 UTC
+++
/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/main/java/core/dao/PersonDao.java
Sun Sep 29 04:43:24 2013 UTC
@@ -10,8 +10,8 @@

import java.util.Date;
import java.util.List;
-import ${groupId}.dao.generic.Dao;
-import ${groupId}.dao.generic.GenericDao;
+import org.lambico.dao.generic.Dao;
+import org.lambico.dao.generic.GenericDao;
import ${package}.core.po.Person;

/**
=======================================
---
/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/main/java/core/po/Person.java
Sat Sep 28 13:35:58 2013 UTC
+++
/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/main/java/core/po/Person.java
Sun Sep 29 04:43:24 2013 UTC
@@ -14,7 +14,7 @@
import javax.persistence.TemporalType;
import javax.xml.bind.annotation.XmlRootElement;
import javax.xml.bind.annotation.XmlSeeAlso;
-import ${groupId}.po.hibernate.EntityBase;
+import org.lambico.po.hibernate.EntityBase;

/**
* An example of a persistent object containing personal data.
=======================================
---
/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/main/java/core/rest/SampleService.java
Sat Sep 28 13:29:19 2013 UTC
+++
/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/main/java/core/rest/SampleService.java
Sun Sep 29 04:43:24 2013 UTC
@@ -28,7 +28,7 @@
import javax.ws.rs.core.Response.ResponseBuilder;
import javax.ws.rs.core.Response.Status;
import javax.ws.rs.core.SecurityContext;
-import ${groupId}.dao.generic.Page;
+import org.lambico.dao.generic.Page;
import ${package}.core.bean.PaginatedResult;
import ${package}.core.bo.PersonBo;
import ${package}.core.dao.PersonDao;
=======================================
---
/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/test/java/core/bo/PersonBoTest.java
Sat Sep 28 13:29:19 2013 UTC
+++
/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/test/java/core/bo/PersonBoTest.java
Sun Sep 29 04:43:24 2013 UTC
@@ -11,9 +11,9 @@
import java.util.List;
import javax.annotation.Resource;
import org.junit.Test;
-import ${groupId}.dao.generic.Page;
-import ${groupId}.test.spring.hibernate.junit4.AbstractBaseTest;
-import ${groupId}.test.spring.hibernate.junit4.FixtureSet;
+import org.lambico.dao.generic.Page;
+import org.lambico.test.spring.hibernate.junit4.AbstractBaseTest;
+import org.lambico.test.spring.hibernate.junit4.FixtureSet;
import ${package}.core.dao.PersonDao;
import ${package}.core.po.Person;

=======================================
---
/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/test/java/core/test/BaseRSTest.java
Sat Sep 28 13:29:19 2013 UTC
+++
/lambico-ws-archetype/src/main/resources/archetype-resources/core/src/test/java/core/test/BaseRSTest.java
Sun Sep 29 04:43:24 2013 UTC
@@ -11,7 +11,6 @@
import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Resource;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
@@ -21,12 +20,11 @@
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.ext.RequestHandler;
import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
-import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
import org.apache.cxf.transport.local.LocalConduit;
import org.junit.After;
import org.junit.Before;
-import ${groupId}.test.spring.hibernate.junit4.AbstractBaseTest;
-import ${groupId}.test.spring.hibernate.junit4.FixtureSet;
+import org.lambico.test.spring.hibernate.junit4.AbstractBaseTest;
+import org.lambico.test.spring.hibernate.junit4.FixtureSet;
import ${package}.core.po.Person;
import ${package}.core.rest.SampleService;
import org.springframework.beans.factory.annotation.Autowired;
=======================================
---
/lambico-ws-archetype/src/test/resources/projects/basic/reference/core/src/test/java/org/lambico/ws/archetype/template/core/test/BaseRSTest.java
Sat Sep 28 13:29:19 2013 UTC
+++
/lambico-ws-archetype/src/test/resources/projects/basic/reference/core/src/test/java/org/lambico/ws/archetype/template/core/test/BaseRSTest.java
Sun Sep 29 04:43:24 2013 UTC
@@ -8,7 +8,6 @@
import com.fasterxml.jackson.jaxrs.json.JacksonJaxbJsonProvider;
import java.util.ArrayList;
import java.util.List;
-import javax.annotation.Resource;
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
@@ -18,7 +17,6 @@
import org.apache.cxf.jaxrs.client.WebClient;
import org.apache.cxf.jaxrs.ext.RequestHandler;
import org.apache.cxf.jaxrs.lifecycle.ResourceProvider;
-import org.apache.cxf.jaxrs.lifecycle.SingletonResourceProvider;
import org.apache.cxf.transport.local.LocalConduit;
import org.junit.After;
import org.junit.Before;