Attachment 158798 Details for Bug 247525 – CVS Diffs

[patch] CVS Diffs

diffs.txt (text/plain), 6.48 KB, created by Nathan Kinder on 2007-07-09 18:52:20 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Nathan Kinder

Created: 2007-07-09 18:52:20 UTC

Size: 6.48 KB

patch

obsolete

>? fedora-admserv-console.spec
>Index: build.properties
>===================================================================
>RCS file: /cvs/dirsec/admservconsole/build.properties,v
>retrieving revision 1.3
>diff -u -5 -t -r1.3 build.properties
>--- build.properties	29 Sep 2006 17:17:27 -0000	1.3
>+++ build.properties	9 Jul 2007 18:42:30 -0000
>@@ -19,10 +19,10 @@
> # Properties to control the build
> 
> lang=en
> 
> admservconsole.root=..
>-admservconsole.version=1.0.3
>-admservconsole.gen.version=1.0
>+admservconsole.version=1.1.0
>+admservconsole.gen.version=1.1
> brand=fedora
> admservconsole.name=${brand}-admserv-${admservconsole.version}
> admservconsole.gen.name=${brand}-admserv-${admservconsole.gen.version}
>Index: build.xml
>===================================================================
>RCS file: /cvs/dirsec/admservconsole/build.xml,v
>retrieving revision 1.1.1.1
>diff -u -5 -t -r1.1.1.1 build.xml
>--- build.xml	22 May 2006 18:14:31 -0000	1.1.1.1
>+++ build.xml	9 Jul 2007 18:42:30 -0000
>@@ -80,14 +80,14 @@
>   
>   <target name="build" depends="import_console">
>     
>     <path id="admservconsole.classpath">
>       <fileset dir="${console.location}">
>-        <include name="**/java/${brand}-base-*.jar"/>
>-        <include name="**/java/${brand}-mcc-*.jar"/>
>-        <include name="**/java/${brand}-nmclf-*.jar"/>
>-        <include name="**/java/ldapjdk.jar"/> 
>+        <include name="**/${brand}-base-*.jar"/>
>+        <include name="**/${brand}-mcc-*.jar"/>
>+        <include name="**/${brand}-nmclf-*.jar"/>
>+        <include name="**/ldapjdk.jar"/> 
>       </fileset>
>       <pathelement path="${built.classdir}"/>
>     </path>
>     
>     <javac   srcdir="${java.src.dir}"
>@@ -113,16 +113,10 @@
>          <include name="com/netscape/management/admserv/**/*.properties" />
>          <include name="com/netscape/management/admserv/**/*.gif" />
>          <include name="com/netscape/management/admserv/**/*.jpg" />
>       </fileset>
>     </jar>
>-    <exec executable="ln" dir="${package.dir}" vmlauncher="true">
>-      <arg line="-s ${admservconsole.name}.jar ${admservconsole.gen.name}.jar"/>
>-    </exec>
>-    <exec executable="ln" dir="${package.dir}" vmlauncher="true">
>-      <arg line="-s ${admservconsole.name}_${lang}.jar ${admservconsole.gen.name}_${lang}.jar"/>
>-    </exec>
>   </target>
> 
>   
>   <target name="javadoc" depends="prepare_doc">
>     <javadoc 
>Index: src/com/netscape/management/admserv/logging/AccessLogViewerModel.java
>===================================================================
>RCS file: /cvs/dirsec/admservconsole/src/com/netscape/management/admserv/logging/AccessLogViewerModel.java,v
>retrieving revision 1.1.1.1
>diff -u -5 -t -r1.1.1.1 AccessLogViewerModel.java
>--- src/com/netscape/management/admserv/logging/AccessLogViewerModel.java	22 May 2006 18:14:37 -0000	1.1.1.1
>+++ src/com/netscape/management/admserv/logging/AccessLogViewerModel.java	9 Jul 2007 18:42:30 -0000
>@@ -68,12 +68,11 @@
>                 "AccessLogViewer: populateRows " + rowStartIndex +
>                 " to " + (rowStartIndex + numRows));
>         try {
>             URL url = new URL(_url + "?op=read" + "&start=" +
>                     rowStartIndex + "&stop=" +
>-                    (rowStartIndex + numRows) + "&" +
>-                    URLEncoder.encode("name=../../../../admin-serv/logs/access"));
>+                    (rowStartIndex + numRows) + "&name=access");
>             HttpManager _httpManager = new HttpManager();
>             AccessDataCommClient commClient =
>                     new AccessDataCommClient(this, _username, _password);
>             _httpManager.get(url, commClient, (ILogViewerModel) this,
>                     CommManager.ASYNC_RESPONSE |
>@@ -99,12 +98,11 @@
>             try // to update _logLength
>             {
>                 _logLengthCalculating = true;
>                 _logLengthAvailable = false;
>                 _logLengthStringBuffer = new StringBuffer();
>-                URL url = new URL(_url + "?op=count" + "&" +
>-                        URLEncoder.encode("name=../../../../admin-serv/logs/access"));
>+                URL url = new URL(_url + "?op=count" + "&name=access");
>                 HttpManager _httpManager = new HttpManager();
>                 LogLengthCommClient commClient =
>                         new AccessLogLengthCommClient(this, _username, _password);
>                 _httpManager.get(url, commClient, _logLengthStringBuffer,
>                         CommManager.ASYNC_RESPONSE |
>Index: src/com/netscape/management/admserv/logging/ErrorLogViewerModel.java
>===================================================================
>RCS file: /cvs/dirsec/admservconsole/src/com/netscape/management/admserv/logging/ErrorLogViewerModel.java,v
>retrieving revision 1.1.1.1
>diff -u -5 -t -r1.1.1.1 ErrorLogViewerModel.java
>--- src/com/netscape/management/admserv/logging/ErrorLogViewerModel.java	22 May 2006 18:14:38 -0000	1.1.1.1
>+++ src/com/netscape/management/admserv/logging/ErrorLogViewerModel.java	9 Jul 2007 18:42:30 -0000
>@@ -63,12 +63,11 @@
>                 "ErrorLogViewer: populateRows " + rowStartIndex +
>                 " to " + (rowStartIndex + numRows));
>         try {
>             URL url = new URL(_url + "?op=read" + "&start=" +
>                     rowStartIndex + "&stop=" +
>-                    (rowStartIndex + numRows) + "&" +
>-                    URLEncoder.encode("name=../../../../admin-serv/logs/error"));
>+                    (rowStartIndex + numRows) + "&name=error");
>             HttpManager _httpManager = new HttpManager();
>             ErrorLogDataClient commClient =
>                     new ErrorLogDataClient(_username, _password);
>             _httpManager.get(url, commClient, (ILogViewerModel) this,
>                     CommManager.ASYNC_RESPONSE |
>@@ -94,12 +93,11 @@
>             try // to update _logLength
>             {
>                 _logLengthCalculating = true;
>                 _logLengthAvailable = false;
>                 _logLengthStringBuffer = new StringBuffer();
>-                URL url = new URL(_url + "?op=count" + "&" +
>-                        URLEncoder.encode("name=../../../../admin-serv/logs/error"));
>+                URL url = new URL(_url + "?op=count" + "&name=error");
>                 HttpManager _httpManager = new HttpManager();
>                 LogLengthCommClient commClient =
>                         new ErrorLogLengthCommClient(_username, _password);
>                 _httpManager.get(url, commClient, _logLengthStringBuffer,
>                         CommManager.ASYNC_RESPONSE |

Actions: View | Diff

Attachments on bug 247525: 158798 | 158802