directory-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From trus...@apache.org
Subject svn commit: r376926 - in /directory/sandbox/trustin/dirmina-158: ./ core/ core/src/site/ core/xdocs/ examples/ filter-codec-asn1/ filter-codec-netty/ filter-ssl/ integration-spring/ src/
Date Sat, 11 Feb 2006 03:59:56 GMT
Author: trustin
Date: Fri Feb 10 19:59:54 2006
New Revision: 376926

URL: http://svn.apache.org/viewcvs?rev=376926&view=rev
Log:
Catching up recent changes in the trunk


Added:
    directory/sandbox/trustin/dirmina-158/apidocs.sh   (with props)
    directory/sandbox/trustin/dirmina-158/core/NOTICE.txt   (with props)
    directory/sandbox/trustin/dirmina-158/examples/LICENSE.txt   (with props)
    directory/sandbox/trustin/dirmina-158/examples/NOTICE.txt   (with props)
    directory/sandbox/trustin/dirmina-158/filter-codec-asn1/LICENSE.txt   (with props)
    directory/sandbox/trustin/dirmina-158/filter-codec-asn1/NOTICE.txt   (with props)
    directory/sandbox/trustin/dirmina-158/filter-codec-netty/LICENSE.txt   (with props)
    directory/sandbox/trustin/dirmina-158/filter-codec-netty/NOTICE.txt   (with props)
    directory/sandbox/trustin/dirmina-158/filter-ssl/LICENSE.txt   (with props)
    directory/sandbox/trustin/dirmina-158/filter-ssl/NOTICE.txt   (with props)
    directory/sandbox/trustin/dirmina-158/integration-spring/LICENSE.txt   (with props)
    directory/sandbox/trustin/dirmina-158/integration-spring/NOTICE.txt   (with props)
    directory/sandbox/trustin/dirmina-158/src/
      - copied from r376912, directory/trunks/mina/src/
Removed:
    directory/sandbox/trustin/dirmina-158/core/src/site/
    directory/sandbox/trustin/dirmina-158/core/xdocs/
Modified:
    directory/sandbox/trustin/dirmina-158/core/LICENSE.txt
    directory/sandbox/trustin/dirmina-158/core/pom.xml
    directory/sandbox/trustin/dirmina-158/examples/pom.xml
    directory/sandbox/trustin/dirmina-158/filter-codec-asn1/pom.xml
    directory/sandbox/trustin/dirmina-158/filter-codec-netty/pom.xml
    directory/sandbox/trustin/dirmina-158/filter-ssl/pom.xml
    directory/sandbox/trustin/dirmina-158/integration-spring/pom.xml
    directory/sandbox/trustin/dirmina-158/pom.xml

Added: directory/sandbox/trustin/dirmina-158/apidocs.sh
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/dirmina-158/apidocs.sh?rev=376926&view=auto
==============================================================================
--- directory/sandbox/trustin/dirmina-158/apidocs.sh (added)
+++ directory/sandbox/trustin/dirmina-158/apidocs.sh Fri Feb 10 19:59:54 2006
@@ -0,0 +1,11 @@
+#!/bin/sh
+
+OUTPUTDIR='apidocs'
+
+SOURCEPATH=$(find . -name src | awk '{ print $1"/main/java" }' | tr '\n' ':')
+
+PACKAGES='org.apache.mina'
+
+EXCLUDES="org.apache.mina.examples:$(grep -h '^package org\.apache\.mina.*support;$' * -R
| sed 's/^package \(.*\.support\);/\1/g' | sed 's/\r//g' | tr '\n' ':' | sed 's/:$//g'| sort
-u)"
+
+javadoc -d $OUTPUTDIR -sourcepath $SOURCEPATH -subpackages $PACKAGES -exclude $EXCLUDES 

Propchange: directory/sandbox/trustin/dirmina-158/apidocs.sh
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: directory/sandbox/trustin/dirmina-158/apidocs.sh
------------------------------------------------------------------------------
    svn:executable = *

Modified: directory/sandbox/trustin/dirmina-158/core/LICENSE.txt
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/dirmina-158/core/LICENSE.txt?rev=376926&r1=376925&r2=376926&view=diff
==============================================================================
--- directory/sandbox/trustin/dirmina-158/core/LICENSE.txt (original)
+++ directory/sandbox/trustin/dirmina-158/core/LICENSE.txt Fri Feb 10 19:59:54 2006
@@ -1,176 +1,20 @@
-                                 Apache License
-                           Version 2.0, January 2004
-                        http://www.apache.org/licenses/
-
-   TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
-
-   1. Definitions.
-
-      "License" shall mean the terms and conditions for use, reproduction,
-      and distribution as defined by Sections 1 through 9 of this document.
-
-      "Licensor" shall mean the copyright owner or entity authorized by
-      the copyright owner that is granting the License.
-
-      "Legal Entity" shall mean the union of the acting entity and all
-      other entities that control, are controlled by, or are under common
-      control with that entity. For the purposes of this definition,
-      "control" means (i) the power, direct or indirect, to cause the
-      direction or management of such entity, whether by contract or
-      otherwise, or (ii) ownership of fifty percent (50%) or more of the
-      outstanding shares, or (iii) beneficial ownership of such entity.
-
-      "You" (or "Your") shall mean an individual or Legal Entity
-      exercising permissions granted by this License.
-
-      "Source" form shall mean the preferred form for making modifications,
-      including but not limited to software source code, documentation
-      source, and configuration files.
-
-      "Object" form shall mean any form resulting from mechanical
-      transformation or translation of a Source form, including but
-      not limited to compiled object code, generated documentation,
-      and conversions to other media types.
-
-      "Work" shall mean the work of authorship, whether in Source or
-      Object form, made available under the License, as indicated by a
-      copyright notice that is included in or attached to the work
-      (an example is provided in the Appendix below).
-
-      "Derivative Works" shall mean any work, whether in Source or Object
-      form, that is based on (or derived from) the Work and for which the
-      editorial revisions, annotations, elaborations, or other modifications
-      represent, as a whole, an original work of authorship. For the purposes
-      of this License, Derivative Works shall not include works that remain
-      separable from, or merely link (or bind by name) to the interfaces of,
-      the Work and Derivative Works thereof.
-
-      "Contribution" shall mean any work of authorship, including
-      the original version of the Work and any modifications or additions
-      to that Work or Derivative Works thereof, that is intentionally
-      submitted to Licensor for inclusion in the Work by the copyright owner
-      or by an individual or Legal Entity authorized to submit on behalf of
-      the copyright owner. For the purposes of this definition, "submitted"
-      means any form of electronic, verbal, or written communication sent
-      to the Licensor or its representatives, including but not limited to
-      communication on electronic mailing lists, source code control systems,
-      and issue tracking systems that are managed by, or on behalf of, the
-      Licensor for the purpose of discussing and improving the Work, but
-      excluding communication that is conspicuously marked or otherwise
-      designated in writing by the copyright owner as "Not a Contribution."
-
-      "Contributor" shall mean Licensor and any individual or Legal Entity
-      on behalf of whom a Contribution has been received by Licensor and
-      subsequently incorporated within the Work.
-
-   2. Grant of Copyright License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      copyright license to reproduce, prepare Derivative Works of,
-      publicly display, publicly perform, sublicense, and distribute the
-      Work and such Derivative Works in Source or Object form.
-
-   3. Grant of Patent License. Subject to the terms and conditions of
-      this License, each Contributor hereby grants to You a perpetual,
-      worldwide, non-exclusive, no-charge, royalty-free, irrevocable
-      (except as stated in this section) patent license to make, have made,
-      use, offer to sell, sell, import, and otherwise transfer the Work,
-      where such license applies only to those patent claims licensable
-      by such Contributor that are necessarily infringed by their
-      Contribution(s) alone or by combination of their Contribution(s)
-      with the Work to which such Contribution(s) was submitted. If You
-      institute patent litigation against any entity (including a
-      cross-claim or counterclaim in a lawsuit) alleging that the Work
-      or a Contribution incorporated within the Work constitutes direct
-      or contributory patent infringement, then any patent licenses
-      granted to You under this License for that Work shall terminate
-      as of the date such litigation is filed.
-
-   4. Redistribution. You may reproduce and distribute copies of the
-      Work or Derivative Works thereof in any medium, with or without
-      modifications, and in Source or Object form, provided that You
-      meet the following conditions:
-
-      (a) You must give any other recipients of the Work or
-          Derivative Works a copy of this License; and
-
-      (b) You must cause any modified files to carry prominent notices
-          stating that You changed the files; and
-
-      (c) You must retain, in the Source form of any Derivative Works
-          that You distribute, all copyright, patent, trademark, and
-          attribution notices from the Source form of the Work,
-          excluding those notices that do not pertain to any part of
-          the Derivative Works; and
-
-      (d) If the Work includes a "NOTICE" text file as part of its
-          distribution, then any Derivative Works that You distribute must
-          include a readable copy of the attribution notices contained
-          within such NOTICE file, excluding those notices that do not
-          pertain to any part of the Derivative Works, in at least one
-          of the following places: within a NOTICE text file distributed
-          as part of the Derivative Works; within the Source form or
-          documentation, if provided along with the Derivative Works; or,
-          within a display generated by the Derivative Works, if and
-          wherever such third-party notices normally appear. The contents
-          of the NOTICE file are for informational purposes only and
-          do not modify the License. You may add Your own attribution
-          notices within Derivative Works that You distribute, alongside
-          or as an addendum to the NOTICE text from the Work, provided
-          that such additional attribution notices cannot be construed
-          as modifying the License.
-
-      You may add Your own copyright statement to Your modifications and
-      may provide additional or different license terms and conditions
-      for use, reproduction, or distribution of Your modifications, or
-      for any such Derivative Works as a whole, provided Your use,
-      reproduction, and distribution of the Work otherwise complies with
-      the conditions stated in this License.
-
-   5. Submission of Contributions. Unless You explicitly state otherwise,
-      any Contribution intentionally submitted for inclusion in the Work
-      by You to the Licensor shall be under the terms and conditions of
-      this License, without any additional terms or conditions.
-      Notwithstanding the above, nothing herein shall supersede or modify
-      the terms of any separate license agreement you may have executed
-      with Licensor regarding such Contributions.
-
-   6. Trademarks. This License does not grant permission to use the trade
-      names, trademarks, service marks, or product names of the Licensor,
-      except as required for reasonable and customary use in describing the
-      origin of the Work and reproducing the content of the NOTICE file.
-
-   7. Disclaimer of Warranty. Unless required by applicable law or
-      agreed to in writing, Licensor provides the Work (and each
-      Contributor provides its Contributions) on an "AS IS" BASIS,
-      WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
-      implied, including, without limitation, any warranties or conditions
-      of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
-      PARTICULAR PURPOSE. You are solely responsible for determining the
-      appropriateness of using or redistributing the Work and assume any
-      risks associated with Your exercise of permissions under this License.
-
-   8. Limitation of Liability. In no event and under no legal theory,
-      whether in tort (including negligence), contract, or otherwise,
-      unless required by applicable law (such as deliberate and grossly
-      negligent acts) or agreed to in writing, shall any Contributor be
-      liable to You for damages, including any direct, indirect, special,
-      incidental, or consequential damages of any character arising as a
-      result of this License or out of the use or inability to use the
-      Work (including but not limited to damages for loss of goodwill,
-      work stoppage, computer failure or malfunction, or any and all
-      other commercial damages or losses), even if such Contributor
-      has been advised of the possibility of such damages.
-
-   9. Accepting Warranty or Additional Liability. While redistributing
-      the Work or Derivative Works thereof, You may choose to offer,
-      and charge a fee for, acceptance of support, warranty, indemnity,
-      or other liability obligations and/or rights consistent with this
-      License. However, in accepting such obligations, You may act only
-      on Your own behalf and on Your sole responsibility, not on behalf
-      of any other Contributor, and only if You agree to indemnify,
-      defend, and hold each Contributor harmless for any liability
-      incurred by, or claims asserted against, such Contributor by reason
-      of your accepting any such warranty or additional liability.
-
-   END OF TERMS AND CONDITIONS
+/*
+ *                           Apache License
+ *                      Version 2.0, January 2004
+ *                   http://www.apache.org/licenses/
+ *
+ *   Copyright ${pom.inceptionYear} Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */

Added: directory/sandbox/trustin/dirmina-158/core/NOTICE.txt
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/dirmina-158/core/NOTICE.txt?rev=376926&view=auto
==============================================================================
--- directory/sandbox/trustin/dirmina-158/core/NOTICE.txt (added)
+++ directory/sandbox/trustin/dirmina-158/core/NOTICE.txt Fri Feb 10 19:59:54 2006
@@ -0,0 +1,2 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

Propchange: directory/sandbox/trustin/dirmina-158/core/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: directory/sandbox/trustin/dirmina-158/core/pom.xml
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/dirmina-158/core/pom.xml?rev=376926&r1=376925&r2=376926&view=diff
==============================================================================
--- directory/sandbox/trustin/dirmina-158/core/pom.xml (original)
+++ directory/sandbox/trustin/dirmina-158/core/pom.xml Fri Feb 10 19:59:54 2006
@@ -4,66 +4,13 @@
   <parent>
     <groupId>org.apache.directory.mina</groupId>
     <artifactId>build</artifactId>
-    <version>0.9.1-SNAPSHOT</version>
+    <version>0.9.1</version>
   </parent>
   <artifactId>mina-core</artifactId>
   <name>Apache MINA Core API</name>
   <inceptionYear>2004</inceptionYear>
 
-  <url>http://directory.apache.org/subprojects/network/</url>
-
-  <issueManagement>
-    <system>jira</system>
-    <url>http://issues.apache.org/jira/browse/DIRMINA</url>
-  </issueManagement>
-
-  <distributionManagement>
-    <site>
-      <id>apache.websites</id>
-      <url>scp://minotaur.apache.org/www/directory.apache.org/newsite/subprojects/network</url>
-    </site>
-  </distributionManagement>
-
-  <scm>
-    <connection>scm:svn:http://svn.apache.org/repos/asf/directory/trunk/org.apache.mina</connection>
-    <url>http://svn.apache.org/viewcvs.cgi/directory/trunk/org.apache.mina/?root=Apache-SVN</url>
-    <developerConnection>scm:svn:https://svn.apache.org/repos/asf/directory/trunk/org.apache.mina</developerConnection>
-  </scm>
-
-  <ciManagement>
-    <notifiers>
-      <notifier>
-        <type>mail</type>
-        <address>mina-dev@directory.apache.org</address>
-      </notifier>
-    </notifiers>
-  </ciManagement>
-
-  <description>
-    MINA (Multipurpose Infrastructure for Network Applications) is a
-    network application framework which helps users develop high
-    performance and highly scalable network applications easily.
-  </description>
-
-  <mailingLists>
-    <mailingList>
-      <name>Apache MINA Developement</name>
-      <subscribe>mina-dev-subscribe@directory.apache.org</subscribe>
-      <unsubscribe>mina-dev-unsubscribe@directory.apache.org</unsubscribe>
-      <archive>http://mail-archives.apache.org/mod_mbox/mina-dev/</archive>
-      <otherArchives>
-        <otherArchive>http://www.archivum.info/mina-dev@directory.apache.org/</otherArchive>
-      </otherArchives>
-    </mailingList>
-  </mailingLists>
-
-  <licenses>
-    <license>
-      <name>Apache 2.0 License</name>
-      <url>http://www.apache.org/licenses/LICENSE-2.0</url>
-      <distribution>repo</distribution>
-    </license>
-  </licenses>
+  <url>http://directory.apache.org/newsite/projects/network/</url>
 
   <dependencies>
 
@@ -87,11 +34,6 @@
     <plugins>
       <plugin>
         <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-site-plugin</artifactId>
-        <version>2.0-beta-4</version>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-compiler-plugin</artifactId>
         <configuration>
           <source>1.4</source>
@@ -119,34 +61,5 @@
       </plugin>
     </plugins>
   </build>
-
-  <reporting>
-    <plugins>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-clover-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-project-info-reports-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.apache.maven.plugins</groupId>
-        <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>taglist-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>jxr-maven-plugin</artifactId>
-      </plugin>
-      <plugin>
-        <groupId>org.codehaus.mojo</groupId>
-        <artifactId>surefire-report-maven-plugin</artifactId>
-      </plugin>
-    </plugins>
-  </reporting>
 </project>
 

Added: directory/sandbox/trustin/dirmina-158/examples/LICENSE.txt
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/dirmina-158/examples/LICENSE.txt?rev=376926&view=auto
==============================================================================
--- directory/sandbox/trustin/dirmina-158/examples/LICENSE.txt (added)
+++ directory/sandbox/trustin/dirmina-158/examples/LICENSE.txt Fri Feb 10 19:59:54 2006
@@ -0,0 +1,20 @@
+/*
+ *                           Apache License
+ *                      Version 2.0, January 2004
+ *                   http://www.apache.org/licenses/
+ *
+ *   Copyright ${pom.inceptionYear} Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */

Propchange: directory/sandbox/trustin/dirmina-158/examples/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: directory/sandbox/trustin/dirmina-158/examples/NOTICE.txt
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/dirmina-158/examples/NOTICE.txt?rev=376926&view=auto
==============================================================================
--- directory/sandbox/trustin/dirmina-158/examples/NOTICE.txt (added)
+++ directory/sandbox/trustin/dirmina-158/examples/NOTICE.txt Fri Feb 10 19:59:54 2006
@@ -0,0 +1,2 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

Propchange: directory/sandbox/trustin/dirmina-158/examples/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: directory/sandbox/trustin/dirmina-158/examples/pom.xml
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/dirmina-158/examples/pom.xml?rev=376926&r1=376925&r2=376926&view=diff
==============================================================================
--- directory/sandbox/trustin/dirmina-158/examples/pom.xml (original)
+++ directory/sandbox/trustin/dirmina-158/examples/pom.xml Fri Feb 10 19:59:54 2006
@@ -4,7 +4,7 @@
   <parent>
     <groupId>org.apache.directory.mina</groupId>
     <artifactId>build</artifactId>
-    <version>0.9.1-SNAPSHOT</version>
+    <version>0.9.1</version>
   </parent>
   <artifactId>mina-examples</artifactId>
   <name>Apache MINA Examples</name>
@@ -13,7 +13,7 @@
     <dependency>
       <groupId>org.apache.directory.mina</groupId>
       <artifactId>mina-filter-ssl</artifactId>
-      <version>0.9.1-SNAPSHOT</version>
+      <version>${pom.version}</version>
     </dependency>
 
     <dependency>
@@ -29,6 +29,7 @@
       <version>1.3.0</version>
       <scope>test</scope>
     </dependency>
+    
   </dependencies>
   <build>
     <plugins>

Added: directory/sandbox/trustin/dirmina-158/filter-codec-asn1/LICENSE.txt
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/dirmina-158/filter-codec-asn1/LICENSE.txt?rev=376926&view=auto
==============================================================================
--- directory/sandbox/trustin/dirmina-158/filter-codec-asn1/LICENSE.txt (added)
+++ directory/sandbox/trustin/dirmina-158/filter-codec-asn1/LICENSE.txt Fri Feb 10 19:59:54
2006
@@ -0,0 +1,20 @@
+/*
+ *                           Apache License
+ *                      Version 2.0, January 2004
+ *                   http://www.apache.org/licenses/
+ *
+ *   Copyright ${pom.inceptionYear} Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */

Propchange: directory/sandbox/trustin/dirmina-158/filter-codec-asn1/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: directory/sandbox/trustin/dirmina-158/filter-codec-asn1/NOTICE.txt
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/dirmina-158/filter-codec-asn1/NOTICE.txt?rev=376926&view=auto
==============================================================================
--- directory/sandbox/trustin/dirmina-158/filter-codec-asn1/NOTICE.txt (added)
+++ directory/sandbox/trustin/dirmina-158/filter-codec-asn1/NOTICE.txt Fri Feb 10 19:59:54
2006
@@ -0,0 +1,2 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

Propchange: directory/sandbox/trustin/dirmina-158/filter-codec-asn1/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: directory/sandbox/trustin/dirmina-158/filter-codec-asn1/pom.xml
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/dirmina-158/filter-codec-asn1/pom.xml?rev=376926&r1=376925&r2=376926&view=diff
==============================================================================
--- directory/sandbox/trustin/dirmina-158/filter-codec-asn1/pom.xml (original)
+++ directory/sandbox/trustin/dirmina-158/filter-codec-asn1/pom.xml Fri Feb 10 19:59:54 2006
@@ -13,15 +13,15 @@
   <dependencies>
 
     <dependency>
-      <groupId>org.apache.directory</groupId>
-      <artifactId>directory-asn1</artifactId>
-      <version>0.3.4-SNAPSHOT</version>
+      <groupId>org.apache.directory.shared</groupId>
+      <artifactId>shared-asn1</artifactId>
+      <version>0.9.4</version>
     </dependency>
 
     <dependency>
       <groupId>org.apache.directory.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>0.9.1-SNAPSHOT</version>
+      <version>${pom.version}</version>
     </dependency>
 
     <dependency>

Added: directory/sandbox/trustin/dirmina-158/filter-codec-netty/LICENSE.txt
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/dirmina-158/filter-codec-netty/LICENSE.txt?rev=376926&view=auto
==============================================================================
--- directory/sandbox/trustin/dirmina-158/filter-codec-netty/LICENSE.txt (added)
+++ directory/sandbox/trustin/dirmina-158/filter-codec-netty/LICENSE.txt Fri Feb 10 19:59:54
2006
@@ -0,0 +1,20 @@
+/*
+ *                           Apache License
+ *                      Version 2.0, January 2004
+ *                   http://www.apache.org/licenses/
+ *
+ *   Copyright ${pom.inceptionYear} Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */

Propchange: directory/sandbox/trustin/dirmina-158/filter-codec-netty/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: directory/sandbox/trustin/dirmina-158/filter-codec-netty/NOTICE.txt
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/dirmina-158/filter-codec-netty/NOTICE.txt?rev=376926&view=auto
==============================================================================
--- directory/sandbox/trustin/dirmina-158/filter-codec-netty/NOTICE.txt (added)
+++ directory/sandbox/trustin/dirmina-158/filter-codec-netty/NOTICE.txt Fri Feb 10 19:59:54
2006
@@ -0,0 +1,2 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

Propchange: directory/sandbox/trustin/dirmina-158/filter-codec-netty/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: directory/sandbox/trustin/dirmina-158/filter-codec-netty/pom.xml
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/dirmina-158/filter-codec-netty/pom.xml?rev=376926&r1=376925&r2=376926&view=diff
==============================================================================
--- directory/sandbox/trustin/dirmina-158/filter-codec-netty/pom.xml (original)
+++ directory/sandbox/trustin/dirmina-158/filter-codec-netty/pom.xml Fri Feb 10 19:59:54 2006
@@ -33,7 +33,7 @@
     <dependency>
       <groupId>org.apache.directory.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>0.9.1-SNAPSHOT</version>
+      <version>${pom.version}</version>
     </dependency>
 
     <dependency>

Added: directory/sandbox/trustin/dirmina-158/filter-ssl/LICENSE.txt
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/dirmina-158/filter-ssl/LICENSE.txt?rev=376926&view=auto
==============================================================================
--- directory/sandbox/trustin/dirmina-158/filter-ssl/LICENSE.txt (added)
+++ directory/sandbox/trustin/dirmina-158/filter-ssl/LICENSE.txt Fri Feb 10 19:59:54 2006
@@ -0,0 +1,20 @@
+/*
+ *                           Apache License
+ *                      Version 2.0, January 2004
+ *                   http://www.apache.org/licenses/
+ *
+ *   Copyright ${pom.inceptionYear} Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */

Propchange: directory/sandbox/trustin/dirmina-158/filter-ssl/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: directory/sandbox/trustin/dirmina-158/filter-ssl/NOTICE.txt
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/dirmina-158/filter-ssl/NOTICE.txt?rev=376926&view=auto
==============================================================================
--- directory/sandbox/trustin/dirmina-158/filter-ssl/NOTICE.txt (added)
+++ directory/sandbox/trustin/dirmina-158/filter-ssl/NOTICE.txt Fri Feb 10 19:59:54 2006
@@ -0,0 +1,2 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

Propchange: directory/sandbox/trustin/dirmina-158/filter-ssl/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: directory/sandbox/trustin/dirmina-158/filter-ssl/pom.xml
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/dirmina-158/filter-ssl/pom.xml?rev=376926&r1=376925&r2=376926&view=diff
==============================================================================
--- directory/sandbox/trustin/dirmina-158/filter-ssl/pom.xml (original)
+++ directory/sandbox/trustin/dirmina-158/filter-ssl/pom.xml Fri Feb 10 19:59:54 2006
@@ -15,7 +15,7 @@
     <dependency>
       <groupId>org.apache.directory.mina</groupId>
       <artifactId>mina-core</artifactId>
-      <version>0.9.1-SNAPSHOT</version>
+      <version>${pom.version}</version>
     </dependency>
 
     <dependency>

Added: directory/sandbox/trustin/dirmina-158/integration-spring/LICENSE.txt
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/dirmina-158/integration-spring/LICENSE.txt?rev=376926&view=auto
==============================================================================
--- directory/sandbox/trustin/dirmina-158/integration-spring/LICENSE.txt (added)
+++ directory/sandbox/trustin/dirmina-158/integration-spring/LICENSE.txt Fri Feb 10 19:59:54
2006
@@ -0,0 +1,20 @@
+/*
+ *                           Apache License
+ *                      Version 2.0, January 2004
+ *                   http://www.apache.org/licenses/
+ *
+ *   Copyright ${pom.inceptionYear} Apache Software Foundation
+ *
+ *   Licensed under the Apache License, Version 2.0 (the "License");
+ *   you may not use this file except in compliance with the License.
+ *   You may obtain a copy of the License at
+ *
+ *       http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *   Unless required by applicable law or agreed to in writing, software
+ *   distributed under the License is distributed on an "AS IS" BASIS,
+ *   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *   See the License for the specific language governing permissions and
+ *   limitations under the License.
+ *
+ */

Propchange: directory/sandbox/trustin/dirmina-158/integration-spring/LICENSE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Added: directory/sandbox/trustin/dirmina-158/integration-spring/NOTICE.txt
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/dirmina-158/integration-spring/NOTICE.txt?rev=376926&view=auto
==============================================================================
--- directory/sandbox/trustin/dirmina-158/integration-spring/NOTICE.txt (added)
+++ directory/sandbox/trustin/dirmina-158/integration-spring/NOTICE.txt Fri Feb 10 19:59:54
2006
@@ -0,0 +1,2 @@
+This product includes software developed by
+The Apache Software Foundation (http://www.apache.org/).

Propchange: directory/sandbox/trustin/dirmina-158/integration-spring/NOTICE.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: directory/sandbox/trustin/dirmina-158/integration-spring/pom.xml
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/dirmina-158/integration-spring/pom.xml?rev=376926&r1=376925&r2=376926&view=diff
==============================================================================
--- directory/sandbox/trustin/dirmina-158/integration-spring/pom.xml (original)
+++ directory/sandbox/trustin/dirmina-158/integration-spring/pom.xml Fri Feb 10 19:59:54 2006
@@ -14,7 +14,7 @@
     <dependency>
       <groupId>org.apache.directory.mina</groupId>
       <artifactId>mina-filter-ssl</artifactId>
-      <version>0.9.1-SNAPSHOT</version>
+      <version>${pom.version}</version>
     </dependency>
 
     <dependency>

Modified: directory/sandbox/trustin/dirmina-158/pom.xml
URL: http://svn.apache.org/viewcvs/directory/sandbox/trustin/dirmina-158/pom.xml?rev=376926&r1=376925&r2=376926&view=diff
==============================================================================
--- directory/sandbox/trustin/dirmina-158/pom.xml (original)
+++ directory/sandbox/trustin/dirmina-158/pom.xml Fri Feb 10 19:59:54 2006
@@ -4,28 +4,28 @@
   <parent>
     <groupId>org.apache.directory</groupId>
     <artifactId>build</artifactId>
-    <version>1.0-SNAPSHOT</version>
+    <version>1.0</version>
   </parent>
   <groupId>org.apache.directory.mina</groupId>
-  <version>0.9.1-SNAPSHOT</version>
+  <version>0.9.1</version>
   <artifactId>build</artifactId>
-  <name>Apache MINA Parent Build</name>
+  <name>Apache MINA</name>
   <packaging>pom</packaging>
 
-  <url>http://directory.apache.org/newsite/projects/network/</url>
-
-  <issueManagement>
-    <system>jira</system>
-    <url>http://issues.apache.org/jira/browse/DIRMINA</url>
-  </issueManagement>
+  <url>http://directory.apache.org/newsite/projects/mina/</url>
 
   <distributionManagement>
     <site>
       <id>apache.websites</id>
-      <url>scp://minotaur.apache.org/www/directory.apache.org/newsite/projects/network/</url>
+      <url>scp://minotaur.apache.org/www/directory.apache.org/newsite/projects/mina/</url>
     </site>
   </distributionManagement>
 
+  <issueManagement>
+    <system>jira</system>
+    <url>http://issues.apache.org/jira/browse/DIRMINA</url>
+  </issueManagement>
+
   <scm>
     <connection>scm:svn:http://svn.apache.org/repos/asf/directory/trunks/mina</connection>
     <url>http://svn.apache.org/viewcvs.cgi/directory/trunks/mina/?root=Apache-SVN</url>
@@ -92,6 +92,7 @@
       <roles>
         <role>Developer</role>
       </roles>
+      <timezone>-5</timezone>
     </developer>
   </developers>
 
@@ -127,24 +128,6 @@
     </dependency>
   </dependencies>
 
-  <repositories>
-    <!-- For snapshots (no release jars or non-apache jars)           -->
-    <repository>
-      <id>apache.snapshots</id>
-      <name>Apache Snapshot Repository</name>
-      <url>http://cvs.apache.org/maven-snapshot-repository</url>
-    </repository>
-    
-    <!-- Temp repo for 3rd party jars that are not in ibiblio.org yet.-->
-    <!-- Artifacts in repo should be requested for ibiblio upload &   -->
-    <!-- removed from this repository - this repo will disappear.     -->
-    <repository>
-      <id>safehaus</id>
-      <name>Alternate Repository for Missing Ibiblio Artifacts</name>
-      <url>http://m2.safehaus.org</url>
-    </repository>
-  </repositories>
-
   <profiles>
     <profile>
       <id>jdk1.5</id>
@@ -214,12 +197,38 @@
         <artifactId>maven-site-plugin</artifactId>
         <version>2.0-SNAPSHOT</version>
       </plugin>
+      <plugin>
+        <inherited>false</inherited>
+        <groupId>org.apache.maven.plugins</groupId>
+        <artifactId>maven-antrun-plugin</artifactId>
+        <executions>
+          <execution>
+            <phase>site</phase>
+            <configuration>
+              <tasks>
+                <javadoc destdir="target/site/apidocs" author="true" use="true" windowtitle="Apache
MINA">
+                  <sourcepath>
+                    <dirset dir=".">
+                      <include name="*/src/main/java"/>
+                    </dirset>
+                  </sourcepath>
+                  <package name="org.apache.mina.*"/>
+                </javadoc>
+              </tasks>
+            </configuration>
+            <goals>
+              <goal>run</goal>
+            </goals>
+          </execution>
+        </executions>
+      </plugin>
 
     </plugins>
   </build>
 
   <reporting>
     <plugins>
+      <!-- This has been disabled to due license expiration issue. -->
       <!-- <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-clover-plugin</artifactId>
@@ -228,14 +237,17 @@
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-project-info-reports-plugin</artifactId>
       </plugin>
-      <plugin>
+      <!-- This is no longer needed while it cannot do 
+           fully connected multi module apidocs. -->
+      <!-- <plugin>
         <groupId>org.apache.maven.plugins</groupId>
         <artifactId>maven-javadoc-plugin</artifactId>
-      </plugin>
+      </plugin> -->
       <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>taglist-maven-plugin</artifactId>
       </plugin>
+      <!-- This has been disabled due to incorrect functioning. -->
       <!-- <plugin>
         <groupId>org.codehaus.mojo</groupId>
         <artifactId>jxr-maven-plugin</artifactId>



Mime
View raw message