Skip to Content.
Sympa Menu

notify-dpml - r1724 - in trunk: . central/site/src/docs/about/sponsorship main/etc/nsi main/transit/core/src/main/net/dpml/transit main/transit/core/src/main/net/dpml/transit/artifact

notify-dpml AT lists.ibiblio.org

Subject: DPML Notify

List archive

Chronological Thread  
  • From: mcconnell at BerliOS <mcconnell AT mail.berlios.de>
  • To: notify-dpml AT lists.ibiblio.org
  • Subject: r1724 - in trunk: . central/site/src/docs/about/sponsorship main/etc/nsi main/transit/core/src/main/net/dpml/transit main/transit/core/src/main/net/dpml/transit/artifact
  • Date: Wed, 9 Aug 2006 06:10:30 +0200

Author: mcconnell
Date: 2006-08-09 06:10:26 +0200 (Wed, 09 Aug 2006)
New Revision: 1724

Modified:
trunk/central/site/src/docs/about/sponsorship/index.xml
trunk/index.xml
trunk/main/etc/nsi/dpml.nsi
trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheHandler.java
trunk/main/transit/core/src/main/net/dpml/transit/DefaultResourceHost.java

trunk/main/transit/core/src/main/net/dpml/transit/artifact/ArtifactURLConnection.java
Log:
housekeeping (include fix to nsi installer script concerning build versus
decimal version references, javadoc content in transit, and context details
in sponsorship page)

Modified: trunk/central/site/src/docs/about/sponsorship/index.xml
===================================================================
--- trunk/central/site/src/docs/about/sponsorship/index.xml 2006-08-07
18:00:22 UTC (rev 1723)
+++ trunk/central/site/src/docs/about/sponsorship/index.xml 2006-08-09
04:10:26 UTC (rev 1724)
@@ -17,7 +17,7 @@
The following companies and organizations have actively contributed
resources
to the Digital Product Meta Library, for which we are very grateful.
If you would like your company to contribute, please contact
- pr-dpml AT lists.ibiblio.org for more information.
+ info AT dpml.net for more information.
</p>

<table>

Modified: trunk/index.xml
===================================================================
--- trunk/index.xml 2006-08-07 18:00:22 UTC (rev 1723)
+++ trunk/index.xml 2006-08-09 04:10:26 UTC (rev 1724)
@@ -35,6 +35,7 @@
<filter token="PUBLISHER-NAME" value="${project.publisher.name}"/>
<filter token="PUBLISHER-URL" value="${project.publisher.url}"/>
<feature token="PROJECT-VERSION" id="decimal"/>
+ <feature token="BUILD-VERSION" id="version"/>
</filters>

<module file="lang/module.xml"/>

Modified: trunk/main/etc/nsi/dpml.nsi
===================================================================
--- trunk/main/etc/nsi/dpml.nsi 2006-08-07 18:00:22 UTC (rev 1723)
+++ trunk/main/etc/nsi/dpml.nsi 2006-08-09 04:10:26 UTC (rev 1724)
@@ -16,7 +16,7 @@

!define ALL_USERS
!define TEMP $R0
-!define VERSION '@PROJECT-VERSION@'
+!define VERSION '@BUILD-VERSION@'

!include "WriteEnvStr.nsh"
!include "PathManipulation.nsh"
@@ -28,7 +28,7 @@
;General
Name "DPML SDK"
Caption "DPML SDK (${VERSION}) Setup"
- OutFile "dpml-sdk-win32-@PROJECT-VERSION@.exe"
+ OutFile "dpml-sdk-win32-@BUILD-VERSION@.exe"

;Folder selection page
InstallDir $PROGRAMFILES\DPML
@@ -149,15 +149,6 @@
File /r ..\bundle\share\local\*
SectionEND

-;Section "docs" SecDoc
-; SetOutPath $INSTDIR\share\docs
-; File /r ..\bundle\share\docs\*
-; !insertmacro MUI_STARTMENU_WRITE_BEGIN Application
-; CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\DPML Home (local).lnk"
"$INSTDIR\share\docs\index.html"
-; CreateShortCut "$SMPROGRAMS\$STARTMENU_FOLDER\DPML Platform API.lnk"
"$INSTDIR\share\docs\api\dpml\@PROJECT-VERSION@\index.html"
-; !insertmacro MUI_STARTMENU_WRITE_END
-;SectionEND
-
Section "station scm" SecStation
Exec "$INSTDIR\share\bin\scm\wrapper.exe -i
$INSTDIR\share\bin\scm\conf\wrapper.conf"
SectionEND

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheHandler.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheHandler.java
2006-08-07 18:00:22 UTC (rev 1723)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultCacheHandler.java
2006-08-09 04:10:26 UTC (rev 1724)
@@ -117,7 +117,7 @@
catch( Throwable e )
{
final String error =
- "Cannot construct cache handler due to a cache layout
resolvution failure.";
+ "Cannot construct cache handler due to a cache layout
resolution failure.";
throw new TransitException( error, e );
}


Modified:
trunk/main/transit/core/src/main/net/dpml/transit/DefaultResourceHost.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/DefaultResourceHost.java
2006-08-07 18:00:22 UTC (rev 1723)
+++
trunk/main/transit/core/src/main/net/dpml/transit/DefaultResourceHost.java
2006-08-09 04:10:26 UTC (rev 1724)
@@ -273,18 +273,10 @@
return m_priority;
}

- /** Downloads the given artifact to the directory indicated.
- * <p>
- * The cachedir argument is the root cache directory, and the
ResourceHost
- * class is responsible for the creation of the directory structure of
the
- * group if nonexistent.
- * </p>
- * <p>
- * If the knownOnly argument is true, then only attempt download if the
- * group is known to exist on this resource host.
- * </p>
+ /**
+ * Downloads a given artifact.
* @param artifact the artifact that is requested to be downloaded.
- * @param dest The output stream where to write the downloaded content.
+ * @param dest the destination output stream into which download content
is to be written
* @exception IOException if an IO related error occurs
*/
public Date download( Artifact artifact, OutputStream dest )
@@ -295,7 +287,6 @@
{
NetworkLoader loader = new NetworkLoader();
URL url = createRemoteUrl( artifact );
-
URLConnection connection;
synchronized ( m_connections )
{

Modified:
trunk/main/transit/core/src/main/net/dpml/transit/artifact/ArtifactURLConnection.java
===================================================================
---
trunk/main/transit/core/src/main/net/dpml/transit/artifact/ArtifactURLConnection.java
2006-08-07 18:00:22 UTC (rev 1723)
+++
trunk/main/transit/core/src/main/net/dpml/transit/artifact/ArtifactURLConnection.java
2006-08-09 04:10:26 UTC (rev 1724)
@@ -78,10 +78,8 @@
* @param url the url to establish a connection with
* @param context the transit context
* @exception NullPointerException if the url argument is null
- * @exception IOException if the url argument is not a valid,
- * i.e. the path must contain a group and an artifactId
- * separated by a slash.
- */
+ * @exception IOException if the url argument is invalid
+ */
ArtifactURLConnection( URL url, SecuredTransitContext context )
throws NullPointerException, IOException
{




  • r1724 - in trunk: . central/site/src/docs/about/sponsorship main/etc/nsi main/transit/core/src/main/net/dpml/transit main/transit/core/src/main/net/dpml/transit/artifact, mcconnell at BerliOS, 08/09/2006

Archive powered by MHonArc 2.6.24.

Top of Page