Show
Ignore:
Timestamp:
02/20/08 17:27:10 (9 months ago)
Author:
fguillaume
Message:

Fix NuxeoClient? use and pom versions.

Files:

Legend:

Unmodified
Added
Removed
Modified
Copied
Moved
  • org.nuxeo.ecm.client/trunk/nuxeo-client-servlet/pom.xml

    r28117 r30372  
    44 
    55  <parent> 
    6     <artifactId>nuxeo-client-parent</artifactId> 
    7     <groupId>org.nuxeo.ecm.client</groupId> 
    8     <version>1.0.0-SNAPSHOT</version> 
     6    <groupId>org.nuxeo.ecm.core</groupId> 
     7    <artifactId>nuxeo-core-parent</artifactId> 
     8    <version>1.5-SNAPSHOT</version> 
    99  </parent> 
    1010 
    1111  <artifactId>nuxeo-client-servlet</artifactId> 
    12   <groupId>org.nuxeo.ecm.client</groupId> 
    13   <version>1.0.0-SNAPSHOT</version> 
     12  <groupId>org.nuxeo.ecm.servlet</groupId> 
    1413  <name>Nuxeo Client Servlet</name> 
    1514  <description>Nuxeo ECM: Nuxeo Client Servlet</description> 
    1615 
    1716  <properties> 
    18     <nuxeo.common.version>1.4-SNAPSHOT</nuxeo.common.version> 
    19     <nuxeo.core.version>1.4-SNAPSHOT</nuxeo.core.version> 
    20     <nuxeo.platform.version>5.2-SNAPSHOT</nuxeo.platform.version> 
    21     <nuxeo.runtime.version>1.4-SNAPSHOT</nuxeo.runtime.version> 
     17    <nuxeo.common.version>${pom.version}</nuxeo.common.version> 
     18    <nuxeo.core.version>${pom.version}</nuxeo.core.version> 
     19    <nuxeo.runtime.version>${pom.version}</nuxeo.runtime.version> 
    2220  </properties> 
    2321 
     
    2523 
    2624    <dependency> 
    27       <groupId>org.nuxeo.ecm.client</groupId> 
    28       <artifactId>nuxeo-client</artifactId> 
    29       <version>${project.version}</version> 
     25      <groupId>org.nuxeo.ecm.core</groupId> 
     26      <artifactId>nuxeo-core-client</artifactId> 
     27      <version>${nuxeo.core.version}</version> 
    3028    </dependency> 
    3129 
     
    4442    <dependency> 
    4543      <groupId>org.nuxeo.runtime</groupId> 
    46       <artifactId>nuxeo-runtime-scripting</artifactId> 
    47       <version>${nuxeo.runtime.version}</version> 
    48     </dependency> 
    49  
    50     <dependency> 
    51       <groupId>org.nuxeo.runtime</groupId> 
    5244      <artifactId>nuxeo-runtime-osgi</artifactId> 
    5345      <version>${nuxeo.runtime.version}</version> 
     
    6759 
    6860    <dependency> 
    69        <groupId>javax.servlet</groupId> 
    70        <artifactId>servlet-api</artifactId> 
    71        <version>2.4</version> 
     61      <groupId>javax.servlet</groupId> 
     62      <artifactId>servlet-api</artifactId> 
     63      <version>2.4</version> 
    7264    </dependency> 
    7365 
     
    7769  <build> 
    7870    <plugins> 
    79       <plugin> 
    80         <groupId>org.apache.maven.plugins</groupId> 
    81         <artifactId>maven-jar-plugin</artifactId> 
    82         <configuration> 
    83           <archive> 
    84             <manifestFile>src/main/resources/META-INF/MANIFEST.MF</manifestFile> 
    85           </archive> 
    86         </configuration> 
    87       </plugin> 
    8871          <!-- Required for the "jboss-sar" type resolution --> 
    8972      <plugin> 
  • org.nuxeo.ecm.client/trunk/nuxeo-client-servlet/src/main/assemble/assembly.xml

    r26622 r30372  
    5151      <artifact name="nuxeo-core-api" /> 
    5252      <artifact name="nuxeo-core-schema" /> 
    53       <artifact name="nuxeo-client" /> 
     53      <artifact name="nuxeo-core-client" /> 
    5454    </includes> 
    5555  </artifactSet> 
  • org.nuxeo.ecm.client/trunk/nuxeo-client-servlet/src/main/java/org/nuxeo/ecm/servlet/DemoServletHandler.java

    r26636 r30372  
    2727import javax.servlet.http.HttpServletResponse; 
    2828 
    29 import org.nuxeo.ecm.client.NuxeoClient; 
     29import org.nuxeo.ecm.core.client.NuxeoClient; 
    3030import org.nuxeo.ecm.core.api.CoreInstance; 
    3131import org.nuxeo.ecm.core.api.CoreSession;