Merge branch 'master' of git@git.useperl.at:PAUSE-OpenID

7 files changed, 11 insertions, 8 deletions

diff --git a/lib/PAUSE/OpenID/Controller/Root.pm b/lib/PAUSE/OpenID/Controller/Root.pm
index 915801c..c37b2c2 100644
--- a/lib/PAUSE/OpenID/Controller/Root.pm
+++ b/lib/PAUSE/OpenID/Controller/Root.pm
@@ -29,8 +29,12 @@ PAUSE::OpenID::Controller::Root - Root Controller for PAUSE::OpenID
 sub index :Path :Args(0) {
     my ( $self, $c ) = @_;
 
+$c->stash->{xml} =<<XML;
+<document/>
+XML
+
     # Hello World
-    $c->response->body( $c->welcome_message );
+    $c->forward('PAUSE::OpenID::View::XSLT');
 }
 
 sub default :Path {
diff --git a/lib/PAUSE/OpenID/View/XSLT.pm b/lib/PAUSE/OpenID/View/XSLT.pm
index 4e2ab2a..423216f 100644
--- a/lib/PAUSE/OpenID/View/XSLT.pm
+++ b/lib/PAUSE/OpenID/View/XSLT.pm
@@ -8,8 +8,7 @@ use base 'Catalyst::View::XSLT';
 __PACKAGE__->config(
    # relative paths to the directories with templates
 	INCLUDE_PATH => [
-		MyApp->path_to( 'root', 'xslt' ),
-		MyApp->path_to( 'templates', 'xsl' ),
+		PAUSE::OpenID->path_to( 'root', 'templates' ),
 	],
 	TEMPLATE_EXTENSION => '.xsl', # default extension when getting template name from the current action
 	DUMP_CONFIG => 1, # use for Debug. Will dump the final (merged) configuration for XSLT view
diff --git a/script/pause_openid_cgi.pl b/script/pause_openid_cgi.pl
index 58703a1..1bf1139 100755
--- a/script/pause_openid_cgi.pl
+++ b/script/pause_openid_cgi.pl
@@ -1,4 +1,4 @@
-#!/opt/perl5.10/bin/perl -w
+#!/usr/bin/perl
 
 BEGIN { $ENV{CATALYST_ENGINE} ||= 'CGI' }
 
diff --git a/script/pause_openid_create.pl b/script/pause_openid_create.pl
index 52c2c4e..8303fcc 100755
--- a/script/pause_openid_create.pl
+++ b/script/pause_openid_create.pl
@@ -1,4 +1,4 @@
-#!/opt/perl5.10/bin/perl -w
+#!/usr/bin/perl
 
 use strict;
 use warnings;
diff --git a/script/pause_openid_fastcgi.pl b/script/pause_openid_fastcgi.pl
index 4b42006..fe8f093 100755
--- a/script/pause_openid_fastcgi.pl
+++ b/script/pause_openid_fastcgi.pl
@@ -1,4 +1,4 @@
-#!/opt/perl5.10/bin/perl -w
+#!/usr/bin/perl
 
 BEGIN { $ENV{CATALYST_ENGINE} ||= 'FastCGI' }
 
diff --git a/script/pause_openid_server.pl b/script/pause_openid_server.pl
index 2e373c2..8eb3308 100755
--- a/script/pause_openid_server.pl
+++ b/script/pause_openid_server.pl
@@ -1,4 +1,4 @@
-#!/opt/perl5.10/bin/perl -w
+#!/usr/bin/perl
 
 BEGIN { 
     $ENV{CATALYST_ENGINE} ||= 'HTTP';
diff --git a/script/pause_openid_test.pl b/script/pause_openid_test.pl
index 36aa777..627c2f6 100755
--- a/script/pause_openid_test.pl
+++ b/script/pause_openid_test.pl
@@ -1,4 +1,4 @@
-#!/opt/perl5.10/bin/perl -w
+#!/usr/bin/perl
 
 use strict;
 use warnings;