Changeset 1522


Ignore:
Timestamp:
2010-05-05 13:34:13 (3 years ago)
Author:
jgou
Message:

start upgrade restlet to revision 6565 (2.0rc3)
see #313

Location:
trunk
Files:
34 edited

Legend:

Unmodified
Added
Removed

  • trunk/core/kauri-json/pom.xml

    r1388 r1522  
    1818  <dependencies> 
    1919    <dependency> 
    20       <groupId>org.restlet</groupId> 
     20      <groupId>org.restlet.jse</groupId> 
    2121      <artifactId>org.restlet</artifactId> 
    2222    </dependency> 

  • trunk/core/kauri-restlet-util/pom.xml

    r1023 r1522  
    1818  <dependencies> 
    1919    <dependency> 
    20       <groupId>org.restlet</groupId> 
     20      <groupId>org.restlet.jse</groupId> 
    2121      <artifactId>org.restlet</artifactId> 
    2222    </dependency> 

  • trunk/core/kauri-runtime-rapi/pom.xml

    r1058 r1522  
    1818  <dependencies> 
    1919    <dependency> 
    20       <groupId>org.restlet</groupId> 
     20      <groupId>org.restlet.jse</groupId> 
    2121      <artifactId>org.restlet</artifactId> 
    2222    </dependency> 

  • trunk/core/kauri-runtime-testfw/pom.xml

    r1023 r1522  
    2222    </dependency> 
    2323    <dependency> 
    24       <groupId>org.restlet</groupId> 
     24      <groupId>org.restlet.jse</groupId> 
    2525      <artifactId>org.restlet</artifactId> 
    2626    </dependency> 

  • trunk/core/kauri-runtime-tests/pom.xml

    r1023 r1522  
    3434    </dependency> 
    3535    <dependency> 
    36       <groupId>org.restlet</groupId> 
     36      <groupId>org.restlet.jse</groupId> 
    3737      <artifactId>org.restlet</artifactId> 
    3838    </dependency> 

  • trunk/core/kauri-runtime/pom.xml

    r1386 r1522  
    6767    </dependency> 
    6868    <dependency> 
    69       <groupId>org.restlet</groupId> 
     69      <groupId>org.restlet.jse</groupId> 
    7070      <artifactId>org.restlet</artifactId> 
    7171    </dependency> 
    7272    <dependency> 
    73       <groupId>org.restlet</groupId> 
     73      <groupId>org.restlet.jse</groupId> 
    7474      <artifactId>org.restlet.ext.jetty</artifactId> 
    7575    </dependency> 

  • trunk/modules/kauri-dbresources/kauri-dbresources-impl/pom.xml

    r1327 r1522  
    1414  <dependencies> 
    1515    <dependency> 
    16       <groupId>org.restlet</groupId> 
     16      <groupId>org.restlet.jse</groupId> 
    1717      <artifactId>org.restlet</artifactId> 
    1818    </dependency> 
    1919    <dependency> 
    20       <groupId>org.restlet</groupId> 
     20      <groupId>org.restlet.jse</groupId> 
    2121      <artifactId>org.restlet.ext.json</artifactId> 
    2222    </dependency> 
    2323    <dependency> 
    24       <groupId>org.restlet</groupId> 
     24      <groupId>org.restlet.jse</groupId> 
    2525      <artifactId>org.restlet.ext.xml</artifactId> 
    2626    </dependency> 

  • trunk/modules/kauri-locale-assignment/pom.xml

    r1023 r1522  
    2727    </dependency> 
    2828    <dependency> 
    29       <groupId>org.restlet</groupId> 
     29      <groupId>org.restlet.jse</groupId> 
    3030      <artifactId>org.restlet</artifactId> 
    3131    </dependency> 

  • trunk/modules/kauri-representation/kauri-representationbuilder-api/pom.xml

    r1023 r1522  
    1616  <dependencies> 
    1717    <dependency> 
    18       <groupId>org.restlet</groupId> 
     18      <groupId>org.restlet.jse</groupId> 
    1919      <artifactId>org.restlet</artifactId> 
    2020    </dependency> 

  • trunk/modules/kauri-representation/kauri-representationbuilder-impl/pom.xml

    r1351 r1522  
    1616  <dependencies> 
    1717    <dependency> 
    18       <groupId>org.restlet</groupId> 
     18      <groupId>org.restlet.jse</groupId> 
    1919      <artifactId>org.restlet</artifactId> 
    2020    </dependency> 

  • trunk/modules/kauri-routing/kauri-routing-api/pom.xml

    r1023 r1522  
    1515  <dependencies> 
    1616    <dependency> 
    17       <groupId>org.restlet</groupId> 
     17      <groupId>org.restlet.jse</groupId> 
    1818      <artifactId>org.restlet</artifactId> 
    1919    </dependency> 

  • trunk/modules/kauri-routing/kauri-routing-impl/pom.xml

    r1023 r1522  
    1616  <dependencies> 
    1717    <dependency> 
    18       <groupId>org.restlet</groupId> 
     18      <groupId>org.restlet.jse</groupId> 
    1919      <artifactId>org.restlet</artifactId> 
    2020    </dependency> 
    … …  
    5555    </dependency> 
    5656    <dependency> 
    57       <groupId>org.restlet</groupId> 
     57      <groupId>org.restlet.jse</groupId> 
    5858      <artifactId>org.restlet.ext.jaxrs</artifactId> 
    5959      <exclusions> 

  • trunk/modules/kauri-security/kauri-security-api/pom.xml

    r1077 r1522  
    1818  <dependencies> 
    1919    <dependency> 
    20       <groupId>org.restlet</groupId> 
     20      <groupId>org.restlet.jse</groupId> 
    2121      <artifactId>org.restlet</artifactId> 
    2222    </dependency> 

  • trunk/modules/kauri-security/kauri-security-auth-methods/pom.xml

    r1138 r1522  
    3131      <groupId>org.kauriproject</groupId> 
    3232      <artifactId>kauri-representationbuilder-api</artifactId> 
     33    </dependency> 
     34        <dependency> 
     35      <groupId>org.restlet.jse</groupId> 
     36      <artifactId>org.restlet.ext.crypto</artifactId> 
    3337    </dependency> 
    3438    <dependency> 

  • trunk/modules/kauri-security/kauri-security-impl/pom.xml

    r1138 r1522  
    3030      <artifactId>kauri-restlet-util</artifactId> 
    3131    </dependency> 
     32        <dependency> 
     33            <groupId>org.restlet.jse</groupId> 
     34            <artifactId>org.restlet.ext.crypto</artifactId> 
     35        </dependency>    
    3236    <dependency> 
    3337      <groupId>commons-logging</groupId> 

  • trunk/modules/kauri-template/kauri-template-service-api/pom.xml

    r1023 r1522  
    1515  <dependencies> 
    1616    <dependency> 
    17       <groupId>org.restlet</groupId> 
     17      <groupId>org.restlet.jse</groupId> 
    1818      <artifactId>org.restlet</artifactId> 
    1919    </dependency> 

  • trunk/modules/kauri-template/kauri-template-service-impl/pom.xml

    r1108 r1522  
    3939    </dependency> 
    4040    <dependency> 
    41       <groupId>org.restlet</groupId> 
     41      <groupId>org.restlet.jse</groupId> 
    4242      <artifactId>org.restlet</artifactId> 
    4343    </dependency> 

  • trunk/modules/kauri-tmprsrc/pom.xml

    r1389 r1522  
    2929    </dependency>    
    3030    <dependency> 
    31       <groupId>org.restlet</groupId> 
     31      <groupId>org.restlet.jse</groupId> 
    3232      <artifactId>org.restlet</artifactId> 
    3333    </dependency> 
    3434    <dependency> 
    35       <groupId>org.restlet</groupId> 
     35      <groupId>org.restlet.jse</groupId> 
    3636      <artifactId>org.restlet.ext.fileupload</artifactId> 
    3737    </dependency> 
    3838    <dependency> 
    39       <groupId>org.restlet</groupId> 
     39      <groupId>org.restlet.jse</groupId> 
    4040      <artifactId>org.restlet.ext.jetty</artifactId> 
    4141    </dependency> 

  • trunk/pom.xml

    r1514 r1522  
    88    <version.springframework>2.5.6</version.springframework> 
    99    <version.springsecurity>2.0.3</version.springsecurity> 
    10     <version.restlet>svn5141</version.restlet> 
     10    <version.restlet>svn6565</version.restlet> 
    1111    <version.slf4j>1.5.2</version.slf4j> 
    1212    <version.jaxrs>1.0</version.jaxrs> 
    … …  
    551551        <groupId>javax.servlet</groupId> 
    552552        <artifactId>servlet-api</artifactId> 
    553         <scope>provided</scope> 
    554553        <version>2.5</version> 
    555554      </dependency> 
    … …  
    685684      </dependency>         
    686685      <dependency> 
    687         <groupId>org.restlet</groupId> 
     686        <groupId>org.restlet.jse</groupId> 
    688687        <artifactId>org.restlet</artifactId> 
    689688        <version>${version.restlet}</version> 
    690689      </dependency> 
    691       <dependency> 
    692         <groupId>org.restlet</groupId> 
     690            <dependency> 
     691        <groupId>org.restlet.jse</groupId> 
     692        <artifactId>org.restlet.ext.crypto</artifactId> 
     693        <version>${version.restlet}</version> 
     694      </dependency> 
     695      <dependency> 
     696        <groupId>org.restlet.jse</groupId> 
    693697        <artifactId>org.restlet.ext.jetty</artifactId> 
    694698        <version>${version.restlet}</version> 
    695699      </dependency> 
    696700      <dependency> 
    697         <groupId>org.restlet</groupId> 
     701        <groupId>org.restlet.jse</groupId> 
    698702        <artifactId>org.restlet.ext.oauth</artifactId> 
    699703        <version>${version.restlet}</version> 
    700704      </dependency> 
    701705      <dependency> 
    702         <groupId>org.restlet</groupId> 
     706        <groupId>org.restlet.jse</groupId> 
    703707        <artifactId>org.restlet.ext.fileupload</artifactId> 
    704708        <version>${version.restlet}</version> 
    705709      </dependency>       
    706710      <dependency> 
    707         <groupId>org.restlet</groupId> 
     711        <groupId>org.restlet.jse</groupId> 
    708712        <artifactId>org.restlet.ext.jaxrs</artifactId> 
    709713        <version>${version.restlet}</version> 
    710714      </dependency> 
    711715      <dependency> 
    712         <groupId>org.restlet</groupId> 
     716        <groupId>org.restlet.jse</groupId> 
    713717        <artifactId>org.restlet.ext.json</artifactId> 
    714718        <version>${version.restlet}</version> 
    715719      </dependency>  
    716720      <dependency> 
    717         <groupId>org.restlet</groupId> 
     721        <groupId>org.restlet.jse</groupId> 
    718722        <artifactId>org.restlet.ext.xml</artifactId> 
    719723        <version>${version.restlet}</version> 

  • trunk/samples/kauri-dbforms-sample/pom.xml

    r1023 r1522  
    1818  <dependencies> 
    1919    <dependency> 
    20       <groupId>org.restlet</groupId> 
     20      <groupId>org.restlet.jse</groupId> 
    2121      <artifactId>org.restlet</artifactId> 
    2222    </dependency> 
    2323    <dependency> 
    24       <groupId>org.restlet</groupId> 
     24      <groupId>org.restlet.jse</groupId> 
    2525      <artifactId>org.restlet.ext.json</artifactId> 
    2626    </dependency> 

  • trunk/samples/kauri-dbresources-sample/pom.xml

    r1023 r1522  
    1818  <dependencies> 
    1919    <dependency> 
    20       <groupId>org.restlet</groupId> 
     20      <groupId>org.restlet.jse</groupId> 
    2121      <artifactId>org.restlet</artifactId> 
    2222    </dependency> 

  • trunk/samples/kauri-forms-sample/pom.xml

    r1494 r1522  
    3838    </dependency> 
    3939    <dependency> 
    40       <groupId>org.restlet</groupId> 
     40      <groupId>org.restlet.jse</groupId> 
    4141      <artifactId>org.restlet</artifactId> 
    4242    </dependency> 

  • trunk/samples/kauri-i18n-sample/pom.xml

    r1023 r1522  
    1818  <dependencies> 
    1919    <dependency> 
    20       <groupId>org.restlet</groupId> 
     20      <groupId>org.restlet.jse</groupId> 
    2121      <artifactId>org.restlet</artifactId> 
    2222    </dependency> 

  • trunk/samples/kauri-representationbuilder-sample/pom.xml

    r1023 r1522  
    1818  <dependencies> 
    1919    <dependency> 
    20       <groupId>org.restlet</groupId> 
     20      <groupId>org.restlet.jse</groupId> 
    2121      <artifactId>org.restlet</artifactId> 
    2222    </dependency> 

  • trunk/samples/kauri-routing-sample/pom.xml

    r1023 r1522  
    1818  <dependencies> 
    1919    <dependency> 
    20       <groupId>org.restlet</groupId> 
     20      <groupId>org.restlet.jse</groupId> 
    2121      <artifactId>org.restlet</artifactId> 
    2222    </dependency> 

  • trunk/samples/kauri-runtime-sample/kauri-runtime-sample-module1/pom.xml

    r1023 r1522  
    1818  <dependencies> 
    1919    <dependency> 
    20       <groupId>org.restlet</groupId> 
     20      <groupId>org.restlet.jse</groupId> 
    2121      <artifactId>org.restlet</artifactId> 
    2222    </dependency> 

  • trunk/samples/kauri-runtime-sample/kauri-runtime-sample-module2/pom.xml

    r1023 r1522  
    1818  <dependencies> 
    1919    <dependency> 
    20       <groupId>org.restlet</groupId> 
     20      <groupId>org.restlet.jse</groupId> 
    2121      <artifactId>org.restlet</artifactId> 
    2222    </dependency> 

  • trunk/samples/kauri-security-sample/pom.xml

    r1138 r1522  
    1818  <dependencies> 
    1919    <dependency> 
    20       <groupId>org.restlet</groupId> 
     20      <groupId>org.restlet.jse</groupId> 
    2121      <artifactId>org.restlet</artifactId> 
    2222    </dependency> 

  • trunk/samples/kauri-template-sample/pom.xml

    r1023 r1522  
    1818  <dependencies> 
    1919    <dependency> 
    20       <groupId>org.restlet</groupId> 
     20      <groupId>org.restlet.jse</groupId> 
    2121      <artifactId>org.restlet</artifactId> 
    2222    </dependency> 

  • trunk/tools/kauri-archetype/kauri-archetype-basic/src/main/resources/archetype-resources/module1/pom.xml

    r469 r1522  
    2121  <dependencies> 
    2222    <dependency> 
    23       <groupId>org.restlet</groupId> 
     23      <groupId>org.restlet.jse</groupId> 
    2424      <artifactId>org.restlet</artifactId> 
    2525    </dependency> 

  • trunk/tools/kauri-archetype/kauri-archetype-basic/src/main/resources/archetype-resources/pom.xml

    r1339 r1522  
    6262    <dependencies> 
    6363      <dependency> 
    64         <groupId>org.restlet</groupId> 
     64        <groupId>org.restlet.jse</groupId> 
    6565        <artifactId>org.restlet</artifactId> 
    6666        <version>${version.restlet}</version> 

  • trunk/tools/kauri-archetype/kauri-archetype-prototyping/src/main/resources/archetype-resources/module1/pom.xml

    r990 r1522  
    1919  <dependencies> 
    2020    <dependency> 
    21       <groupId>org.restlet</groupId> 
     21      <groupId>org.restlet.jse</groupId> 
    2222      <artifactId>org.restlet</artifactId> 
    2323    </dependency> 

  • trunk/tools/kauri-archetype/kauri-archetype-prototyping/src/main/resources/archetype-resources/pom.xml

    r1339 r1522  
    6262    <dependencies> 
    6363      <dependency> 
    64         <groupId>org.restlet</groupId> 
     64        <groupId>org.restlet.jse</groupId> 
    6565        <artifactId>org.restlet</artifactId> 
    6666        <version>${version.restlet}</version> 

  • trunk/tools/kauri-runtime-servlet/pom.xml

    r1090 r1522  
    2525      <artifactId>servlet-api</artifactId> 
    2626    </dependency> 
     27        <!-- TODO: upgrade ? --> 
    2728    <dependency> 
    2829      <groupId>org.restlet</groupId> 
    2930      <artifactId>org.restlet.ext.servlet</artifactId> 
    30       <version>${version.restlet}</version> 
     31      <version>svn5141</version> 
    3132    </dependency> 
    3233  </dependencies> 
Note: See TracChangeset for help on using the changeset viewer.