[pLog-svn] r2075 - in plog/branches: . plog-1.0.2/bin-devel plog-1.0.2/config plog-1.0.2/release plog-1.0.2/tmp

[Oscar Renalias]

I will merge 1.0.1 with trunk/ sometime this weekend if I have some  
time... I fear that there might be conflicts that will take some time  
to resolve. We should also look into merging Ben's stuff with the 1.1  
trunk, btw.

Oscar

On 24 May 2005, at 21:29, oscar at devel.plogworld.net wrote:

> Author: oscar
> Date: 2005-05-24 18:29:13 +0000 (Tue, 24 May 2005)
> New Revision: 2075
>
> Added:
>    plog/branches/plog-1.0.2/
>    plog/branches/plog-1.0.2/release/logging.properties.php.dist
> Modified:
>    plog/branches/plog-1.0.2/bin-devel/build-svn.sh
>    plog/branches/plog-1.0.2/config/config.properties.php
>    plog/branches/plog-1.0.2/config/logging.properties.php
>    plog/branches/plog-1.0.2/tmp/
> Log:
> the plog-1.0.2 branch is rooted right after where plog-1.0.1 left.  
> This doesn't mean that we are going to use it (looks like we will),  
> but keep in mind that you should now
> switch your working copies for the 1.0.x branch to this one and  
> forget about 1.0.1.
>
>
> Copied: plog/branches/plog-1.0.2 (from rev 2069, plog/branches/ 
> plog-1.0.1)
>
> Modified: plog/branches/plog-1.0.2/bin-devel/build-svn.sh
> ===================================================================
> --- plog/branches/plog-1.0.1/bin-devel/build-svn.sh    2005-05-24  
> 15:06:41 UTC (rev 2069)
> +++ plog/branches/plog-1.0.2/bin-devel/build-svn.sh    2005-05-24  
> 18:29:13 UTC (rev 2075)
> @@ -108,6 +108,7 @@
>  # copy the generic config file and remove the dist/ folder since  
> it is not needed
>  message "Copying the generic config.properties.file..."
>  cp -f $WORKDIR/release/config.properties.php.dist $WORKDIR/config/ 
> config.properties.php
> +cp -f $WORKDIR/release/logging.properties.php.dist $WORKDIR/config/ 
> logging.properties.php
>  rm -rf $WORKDIR/dist
>
>  # finally, update the version.php file
>
> Modified: plog/branches/plog-1.0.2/config/config.properties.php
> ===================================================================
> --- plog/branches/plog-1.0.1/config/config.properties.php     
> 2005-05-24 15:06:41 UTC (rev 2069)
> +++ plog/branches/plog-1.0.2/config/config.properties.php     
> 2005-05-24 18:29:13 UTC (rev 2075)
> @@ -2,9 +2,9 @@
>  #
>  # database settings
>  #
> -$config["db_host"] = "";
> -$config["db_username"] = "";
> -$config["db_password"] = "";
> -$config["db_database"] = "";
> -$config["db_prefix"] = "";
> -?>
> \ No newline at end of file
> +$config["db_host"] = "localhost";
> +$config["db_username"] = "root";
> +$config["db_password"] = "1796sz";
> +$config["db_database"] = "plog_101";
> +$config["db_prefix"] = "plog_";
> +?>
>
> Modified: plog/branches/plog-1.0.2/config/logging.properties.php
> ===================================================================
> --- plog/branches/plog-1.0.1/config/logging.properties.php     
> 2005-05-24 15:06:41 UTC (rev 2069)
> +++ plog/branches/plog-1.0.2/config/logging.properties.php     
> 2005-05-24 18:29:13 UTC (rev 2075)
> @@ -6,7 +6,7 @@
>  #
>  $config["default"] = Array(
>      "layout" => "%d %N - [%f:%l (%c:%F)] %m%n",
> -    "appender" => "null",
> +    "appender" => "file",
>      "file" => "tmp/plog.log",
>      "prio" => "debug"
>    );
> @@ -33,5 +33,4 @@
>      "file" => "tmp/trackback.log",
>      "prio" => "debug"
>    );
> -
>  ?>
>
> Copied: plog/branches/plog-1.0.2/release/ 
> logging.properties.php.dist (from rev 2072, plog/branches/ 
> plog-1.0.1/release/logging.properties.php.dist)
>
>
> Property changes on: plog/branches/plog-1.0.2/tmp
> ___________________________________________________________________
> Name: svn:ignore
>    + *.template
> *.php
> *.log
> *
>
>
> _______________________________________________
> pLog-svn mailing list
> pLog-svn at devel.plogworld.net
> http://devel.plogworld.net/mailman/listinfo/plog-svn
>
>